mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
enable -DRN_USE_ANIMATION_BACKEND by default (#55266)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55266 ## Changelog: [General] [Changed] - enable -DRN_USE_ANIMATION_BACKEND by default Reviewed By: cipolleschi Differential Revision: D91056420 fbshipit-source-id: bd8ef6b63a593540688c1af6a25274d047f43f9b
This commit is contained in:
1 parent
3d0aa9fa8d
commit
4cfb2ee468
10 files changed
+4
-36
No files matched your search
@@ -456,7 +456,7 @@ let reactFabric = RNTarget(
|
||||
"components/root/tests",
|
||||
],
|
||||
dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga],
|
||||
sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
|
||||
sources: ["animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
|
||||
)
|
||||
|
||||
let reactFabricInputAccessory = RNTarget(
|
||||
|
||||
@@ -56,6 +56,7 @@ Pod::Spec.new do |s|
|
||||
add_rncore_dependency(s)
|
||||
|
||||
s.subspec "animated" do |ss|
|
||||
ss.dependency "React-Fabric/animationbackend"
|
||||
ss.source_files = podspec_sources("react/renderer/animated/**/*.{m,mm,cpp,h}", "react/renderer/animated/**/*.{h}")
|
||||
ss.exclude_files = "react/renderer/animated/tests"
|
||||
ss.header_dir = "react/renderer/animated"
|
||||
|
||||
@@ -32,4 +32,3 @@ target_link_libraries(react_renderer_animated
|
||||
)
|
||||
target_compile_reactnative_options(react_renderer_animated PRIVATE)
|
||||
target_compile_options(react_renderer_animated PRIVATE -Wpedantic)
|
||||
target_compile_definitions(react_renderer_animated PRIVATE RN_USE_ANIMATION_BACKEND)
|
||||
-9
@@ -514,11 +514,9 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(
|
||||
// proactivelly trigger the animation loop to avoid showing stale
|
||||
// frames.
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
if (auto animationBackend = animationBackend_.lock()) {
|
||||
animationBackend->trigger();
|
||||
}
|
||||
#endif
|
||||
} else {
|
||||
onRender();
|
||||
}
|
||||
@@ -553,14 +551,12 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded(bool isAsync) {
|
||||
}
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
if (auto animationBackend = animationBackend_.lock()) {
|
||||
animationBackendCallbackId_ =
|
||||
animationBackend->start([this](AnimationTimestamp timestamp) {
|
||||
return pullAnimationMutations(timestamp);
|
||||
});
|
||||
}
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -579,13 +575,11 @@ void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded(
|
||||
auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(false);
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
if (isRenderCallbackStarted) {
|
||||
if (auto animationBackend = animationBackend_.lock()) {
|
||||
animationBackend->stop(animationBackendCallbackId_);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -947,8 +941,6 @@ void NativeAnimatedNodesManager::schedulePropsCommit(
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
|
||||
void NativeAnimatedNodesManager::insertMutations(
|
||||
std::unordered_map<Tag, std::pair<ShadowNodeFamily::Weak, folly::dynamic>>&
|
||||
updates,
|
||||
@@ -1089,7 +1081,6 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(
|
||||
shouldRequestAsyncFlush_.clear();
|
||||
return mutations;
|
||||
}
|
||||
#endif
|
||||
|
||||
void NativeAnimatedNodesManager::onRender() {
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
|
||||
@@ -17,10 +17,8 @@
|
||||
#include <react/debug/flags.h>
|
||||
#include <react/renderer/animated/EventEmitterListener.h>
|
||||
#include <react/renderer/animated/event_drivers/EventAnimationDriver.h>
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
#include <react/renderer/animationbackend/AnimatedPropsBuilder.h>
|
||||
#include <react/renderer/animationbackend/AnimationBackend.h>
|
||||
#endif
|
||||
#include <react/renderer/core/ReactPrimitives.h>
|
||||
#include <react/renderer/core/ShadowNode.h>
|
||||
#include <react/renderer/uimanager/UIManagerAnimationBackend.h>
|
||||
@@ -121,7 +119,6 @@ class NativeAnimatedNodesManager {
|
||||
|
||||
void setAnimatedNodeOffset(Tag tag, double offset);
|
||||
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
void insertMutations(
|
||||
std::unordered_map<Tag, std::pair<ShadowNodeFamily::Weak, folly::dynamic>> &updates,
|
||||
AnimationMutations &mutations,
|
||||
@@ -129,7 +126,6 @@ class NativeAnimatedNodesManager {
|
||||
bool hasLayoutUpdates = false);
|
||||
AnimationMutations onAnimationFrameForBackend(AnimatedPropsBuilder &propsBuilder, AnimationTimestamp timestamp);
|
||||
AnimationMutations pullAnimationMutations(AnimationTimestamp timestamp);
|
||||
#endif
|
||||
|
||||
#pragma mark - Drivers
|
||||
|
||||
@@ -286,9 +282,7 @@ class NativeAnimatedNodesManager {
|
||||
bool warnedAboutGraphTraversal_ = false;
|
||||
#endif
|
||||
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
CallbackId animationBackendCallbackId_{0};
|
||||
#endif
|
||||
|
||||
friend class ColorAnimatedNode;
|
||||
friend class AnimationDriver;
|
||||
|
||||
+1
-5
@@ -11,10 +11,8 @@
|
||||
#include <react/featureflags/ReactNativeFeatureFlags.h>
|
||||
#include <react/renderer/animated/MergedValueDispatcher.h>
|
||||
#include <react/renderer/animated/internal/AnimatedMountingOverrideDelegate.h>
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
#include <react/renderer/animationbackend/AnimationBackend.h>
|
||||
#endif
|
||||
#include <react/renderer/animated/internal/primitives.h>
|
||||
#include <react/renderer/animationbackend/AnimationBackend.h>
|
||||
#include <react/renderer/components/view/conversions.h>
|
||||
#include <react/renderer/scheduler/Scheduler.h>
|
||||
#include <react/renderer/uimanager/UIManagerBinding.h>
|
||||
@@ -87,7 +85,6 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
|
||||
};
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
auto animationBackend = uiManager->unstable_getAnimationBackend().lock();
|
||||
react_native_assert(
|
||||
animationBackend != nullptr && "animationBackend is nullptr");
|
||||
@@ -95,7 +92,6 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
|
||||
|
||||
nativeAnimatedNodesManager_ =
|
||||
std::make_shared<NativeAnimatedNodesManager>(animationBackend);
|
||||
#endif
|
||||
} else {
|
||||
nativeAnimatedNodesManager_ =
|
||||
std::make_shared<NativeAnimatedNodesManager>(
|
||||
|
||||
@@ -37,4 +37,3 @@ target_link_libraries(react_renderer_scheduler
|
||||
)
|
||||
target_compile_reactnative_options(react_renderer_scheduler PRIVATE)
|
||||
target_compile_options(react_renderer_scheduler PRIVATE -Wpedantic)
|
||||
target_compile_definitions(react_renderer_scheduler PRIVATE RN_USE_ANIMATION_BACKEND)
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <cxxreact/TraceSection.h>
|
||||
#include <react/debug/react_native_assert.h>
|
||||
#include <react/featureflags/ReactNativeFeatureFlags.h>
|
||||
#include <react/renderer/animationbackend/AnimationBackend.h>
|
||||
#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
|
||||
#include <react/renderer/core/EventQueueProcessor.h>
|
||||
#include <react/renderer/core/LayoutContext.h>
|
||||
@@ -21,9 +22,6 @@
|
||||
#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
|
||||
#include <react/renderer/uimanager/UIManager.h>
|
||||
#include <react/renderer/uimanager/UIManagerBinding.h>
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
#include <react/renderer/animationbackend/AnimationBackend.h>
|
||||
#endif
|
||||
|
||||
namespace facebook::react {
|
||||
|
||||
@@ -59,7 +57,6 @@ Scheduler::Scheduler(
|
||||
std::make_shared<UIManager>(runtimeExecutor_, contextContainer_);
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
#ifdef RN_USE_ANIMATION_BACKEND
|
||||
auto animationBackend = std::make_shared<AnimationBackend>(
|
||||
schedulerToolbox.animationChoreographer, uiManager);
|
||||
|
||||
@@ -67,7 +64,6 @@ Scheduler::Scheduler(
|
||||
animationBackend);
|
||||
|
||||
uiManager->unstable_setAnimationBackend(animationBackend);
|
||||
#endif
|
||||
}
|
||||
|
||||
auto eventOwnerBox = std::make_shared<EventBeat::OwnerBox>();
|
||||
|
||||
@@ -15,7 +15,6 @@ import {NATIVE_BUILD_OUTPUT_PATH} from '../paths';
|
||||
import {
|
||||
getBuckModesForPlatform,
|
||||
getBuckOptionsForHermes,
|
||||
getConfigForAnimationBackend,
|
||||
getDebugInfoFromCommandResult,
|
||||
runBuck2,
|
||||
runBuck2Sync,
|
||||
@@ -55,7 +54,6 @@ export function build(options: TesterOptions): void {
|
||||
'build',
|
||||
...getBuckModesForPlatform(options.isOptimizedMode),
|
||||
...getBuckOptionsForHermes(options.hermesVariant),
|
||||
...getConfigForAnimationBackend(),
|
||||
FANTOM_TESTER_BUCK_TARGET,
|
||||
'--out',
|
||||
tmpPath,
|
||||
@@ -96,7 +94,6 @@ export function run(
|
||||
'run',
|
||||
...getBuckModesForPlatform(options.isOptimizedMode),
|
||||
...getBuckOptionsForHermes(options.hermesVariant),
|
||||
...getConfigForAnimationBackend(),
|
||||
FANTOM_TESTER_BUCK_TARGET,
|
||||
'--',
|
||||
...args,
|
||||
|
||||
-5
@@ -109,11 +109,6 @@ export function getBuckModesForPlatform(
|
||||
return modes;
|
||||
}
|
||||
|
||||
// TODO: T240293839 Remove when we get rid of RN_USE_ANIMATION_BACKEND preprocessor flag
|
||||
export function getConfigForAnimationBackend(): ReadonlyArray<string> {
|
||||
return ['-c rn.use_animationbackend=true'];
|
||||
}
|
||||
|
||||
export type AsyncCommandResult = {
|
||||
originalCommand: string,
|
||||
childProcess: ReturnType<typeof spawn>,
|
||||
|
||||
Reference in new issue
Block a user