Skip to content

Add pushAnimationMutations to the AnimationBackend #56401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bartlomiejbloniarz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add pushAnimationMutations to the AnimationBackend #56401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,10 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(
// frames.
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
if (auto animationBackend = animationBackend_.lock()) {
animationBackend->trigger();
animationBackend->pushAnimationMutations(
[this](AnimationTimestamp timestamp) -> AnimationMutations {
return pullAnimationMutations(timestamp);
});
}
} else {
onRender();
Expand Down
68 changes: 47 additions & 21 deletions packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,27 @@ AnimationBackend::AnimationBackend(
react_native_assert(uiManager_.expired() == false);
}

void AnimationBackend::onAnimationFrame(AnimationTimestamp timestamp) {
std::vector<CallbackWithId> callbacksCopy;
std::unordered_map<SurfaceId, SurfaceUpdates> surfaceUpdates;
std::set<SurfaceId> asyncFlushSurfaces;
void AnimationBackend::unpackMutations(
AnimationMutations& mutations,
std::unordered_map<SurfaceId, SurfaceUpdates>& surfaceUpdates,
std::set<SurfaceId>& asyncFlushSurfaces) {
for (auto& mutation : mutations.batch) {
const auto family = mutation.family;
react_native_assert(family != nullptr);

{
std::lock_guard lock(mutex_);
callbacksCopy = callbacks;
auto& [families, updates, hasLayoutUpdates] =
surfaceUpdates[family->getSurfaceId()];
hasLayoutUpdates |= mutation.hasLayoutUpdates;
families.insert(family);
updates[mutation.tag] = std::move(mutation.props);
}

for (auto& callbackWithId : callbacksCopy) {
auto mutations = callbackWithId.callback(timestamp);
asyncFlushSurfaces.merge(mutations.asyncFlushSurfaces);
for (auto& mutation : mutations.batch) {
const auto family = mutation.family;
react_native_assert(family != nullptr);

auto& [families, updates, hasLayoutUpdates] =
surfaceUpdates[family->getSurfaceId()];
hasLayoutUpdates |= mutation.hasLayoutUpdates;
families.insert(family);
updates[mutation.tag] = std::move(mutation.props);
}
}
asyncFlushSurfaces.merge(mutations.asyncFlushSurfaces);
}

void AnimationBackend::applySurfaceUpdates(
std::unordered_map<SurfaceId, SurfaceUpdates>& surfaceUpdates,
const std::set<SurfaceId>& asyncFlushSurfaces) {
animatedPropsRegistry_->update(surfaceUpdates);

for (auto& [surfaceId, updates] : surfaceUpdates) {
Expand All @@ -89,6 +85,30 @@ void AnimationBackend::onAnimationFrame(AnimationTimestamp timestamp) {
requestAsyncFlushForSurfaces(asyncFlushSurfaces);
}

void AnimationBackend::applyMutations(AnimationMutations mutations) {
std::unordered_map<SurfaceId, SurfaceUpdates> surfaceUpdates;
std::set<SurfaceId> asyncFlushSurfaces;
unpackMutations(mutations, surfaceUpdates, asyncFlushSurfaces);
applySurfaceUpdates(surfaceUpdates, asyncFlushSurfaces);
}

void AnimationBackend::onAnimationFrame(AnimationTimestamp timestamp) {
std::vector<CallbackWithId> callbacksCopy;

{
std::lock_guard lock(mutex_);
callbacksCopy = callbacks;
}

std::unordered_map<SurfaceId, SurfaceUpdates> surfaceUpdates;
std::set<SurfaceId> asyncFlushSurfaces;
for (auto& callbackWithId : callbacksCopy) {
auto mutations = callbackWithId.callback(timestamp);
unpackMutations(mutations, surfaceUpdates, asyncFlushSurfaces);
}
applySurfaceUpdates(surfaceUpdates, asyncFlushSurfaces);
}

CallbackId AnimationBackend::start(const Callback& callback) {
std::lock_guard lock(mutex_);

Expand Down Expand Up @@ -123,6 +143,12 @@ void AnimationBackend::trigger() {
onAnimationFrame(std::chrono::steady_clock::now().time_since_epoch());
}

void AnimationBackend::pushAnimationMutations(const Callback& callback) {
auto timestamp = animationChoreographer_->now();
auto mutations = callback(timestamp);
applyMutations(std::move(mutations));
}

void AnimationBackend::commitUpdates(
SurfaceId surfaceId,
SurfaceUpdates& surfaceUpdates) {
Expand Down
9 changes: 9 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,19 @@ class AnimationBackend : public UIManagerAnimationBackend {

void onAnimationFrame(AnimationTimestamp timestamp) override;
void trigger() override;
void pushAnimationMutations(const Callback &callback) override;
CallbackId start(const Callback &callback) override;
void stop(CallbackId callbackId) override;

private:
void unpackMutations(
AnimationMutations &mutations,
std::unordered_map<SurfaceId, SurfaceUpdates> &surfaceUpdates,
std::set<SurfaceId> &asyncFlushSurfaces);
void applySurfaceUpdates(
std::unordered_map<SurfaceId, SurfaceUpdates> &surfaceUpdates,
const std::set<SurfaceId> &asyncFlushSurfaces);
void applyMutations(AnimationMutations mutations);
std::vector<CallbackWithId> callbacks;
std::shared_ptr<AnimatedPropsRegistry> animatedPropsRegistry_;
std::shared_ptr<AnimationChoreographer> animationChoreographer_;
Expand Down
5 changes: 5 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationChoreographer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#pragma once

#include <react/renderer/uimanager/UIManagerAnimationBackend.h>
#include <react/timing/primitives.h>

namespace facebook::react {

Expand All @@ -21,6 +22,10 @@ class AnimationChoreographer {

virtual void resume() = 0;
virtual void pause() = 0;
virtual AnimationTimestamp now() const
{
return HighResTimeStamp::now().toChronoSteadyClockTimePoint().time_since_epoch();
}
void setAnimationBackend(std::weak_ptr<UIManagerAnimationBackend> animationBackend)
{
animationBackend_ = animationBackend;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class UIManagerAnimationBackend {
virtual void stop(CallbackId callbackId) = 0;
virtual void clearRegistry(SurfaceId surfaceId) = 0;
virtual void trigger() = 0;
virtual void pushAnimationMutations(const Callback &callback) = 0;
virtual void registerJSInvoker(std::shared_ptr<CallInvoker> jsInvoker) = 0;
};

Expand Down
16 changes: 16 additions & 0 deletions private/react-native-fantom/tester/src/TesterAnimationChoreographer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <functional>

#include <react/renderer/animationbackend/AnimationChoreographer.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <react/runtime/ReactInstanceConfig.h>
Expand All @@ -19,8 +21,22 @@ class TesterAnimationChoreographer : public AnimationChoreographer {
void pause() override;
void runUITick(AnimationTimestamp timestamp);

AnimationTimestamp now() const override
{
if (clockProvider_) {
return clockProvider_();
}
return AnimationChoreographer::now();
}

void setClockProvider(std::function<AnimationTimestamp()> clockProvider)
{
clockProvider_ = std::move(clockProvider);
}

private:
bool isPaused_{false};
std::function<AnimationTimestamp()> clockProvider_;
};

} // namespace facebook::react
10 changes: 8 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,6 +1546,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
public virtual void stop(facebook::react::CallbackId callbackId) override;
public virtual void trigger() override;
Expand All @@ -1562,6 +1563,7 @@ class facebook::react::AnimationBackendCommitHook : public facebook::react::UIMa
}

class facebook::react::AnimationChoreographer {
public virtual facebook::react::AnimationTimestamp now() const;
public virtual void pause() = 0;
public virtual void resume() = 0;
public virtual ~AnimationChoreographer() = default;
Expand Down Expand Up @@ -2814,7 +2816,7 @@ class facebook::react::JReactHostInspectorTarget : public jni::HybridClass<faceb
public static void registerNatives();
public virtual facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override;
public virtual facebook::react::jsinspector_modern::HostTargetTracingDelegate* getTracingDelegate() override;
public virtual void captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&, const std::function<void(std::optional<std::string> base64Data)>& callback) override;
public virtual std::optional<std::string> captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&) override;
public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) override;
public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) override;
public void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest& params, facebook::react::jsinspector_modern::ScopedExecutor<facebook::react::jsinspector_modern::NetworkRequestListener> executor) override;
Expand Down Expand Up @@ -5211,6 +5213,7 @@ class facebook::react::UIManagerAnimationBackend {
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
public virtual void stop(facebook::react::CallbackId callbackId) = 0;
public virtual void trigger() = 0;
Expand Down Expand Up @@ -10379,7 +10382,7 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook:
public facebook::react::jsinspector_modern::HostTargetDelegate& operator=(facebook::react::jsinspector_modern::HostTargetDelegate&&) = delete;
public virtual facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() = 0;
public virtual facebook::react::jsinspector_modern::HostTargetTracingDelegate* getTracingDelegate();
public virtual void captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&, const std::function<void(std::optional<std::string> base64Data)>& callback);
public virtual std::optional<std::string> captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&);
public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor<facebook::react::jsinspector_modern::NetworkRequestListener>) override;
public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0;
public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0;
Expand Down Expand Up @@ -12930,6 +12933,8 @@ class facebook::yoga::StyleSizeLength {
class facebook::yoga::StyleValueHandle {
public constexpr bool isAuto() const;
public constexpr bool isDefined() const;
public constexpr bool isPercent() const;
public constexpr bool isPoint() const;
public constexpr bool isUndefined() const;
public static constexpr facebook::yoga::StyleValueHandle ofAuto();
}
Expand All @@ -12938,6 +12943,7 @@ class facebook::yoga::StyleValuePool {
public facebook::yoga::FloatOptional getNumber(facebook::yoga::StyleValueHandle handle) const;
public facebook::yoga::StyleLength getLength(facebook::yoga::StyleValueHandle handle) const;
public facebook::yoga::StyleSizeLength getSize(facebook::yoga::StyleValueHandle handle) const;
public float getStoredValue(facebook::yoga::StyleValueHandle handle) const;
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::FloatOptional number);
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::StyleLength length);
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::StyleSizeLength sizeValue);
Expand Down
10 changes: 8 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,6 +1545,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
public virtual void stop(facebook::react::CallbackId callbackId) override;
public virtual void trigger() override;
Expand All @@ -1561,6 +1562,7 @@ class facebook::react::AnimationBackendCommitHook : public facebook::react::UIMa
}

class facebook::react::AnimationChoreographer {
public virtual facebook::react::AnimationTimestamp now() const;
public virtual void pause() = 0;
public virtual void resume() = 0;
public virtual ~AnimationChoreographer() = default;
Expand Down Expand Up @@ -2811,7 +2813,7 @@ class facebook::react::JReactHostInspectorTarget : public jni::HybridClass<faceb
public static void registerNatives();
public virtual facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override;
public virtual facebook::react::jsinspector_modern::HostTargetTracingDelegate* getTracingDelegate() override;
public virtual void captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&, const std::function<void(std::optional<std::string> base64Data)>& callback) override;
public virtual std::optional<std::string> captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&) override;
public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) override;
public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) override;
public void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest& params, facebook::react::jsinspector_modern::ScopedExecutor<facebook::react::jsinspector_modern::NetworkRequestListener> executor) override;
Expand Down Expand Up @@ -5202,6 +5204,7 @@ class facebook::react::UIManagerAnimationBackend {
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
public virtual void stop(facebook::react::CallbackId callbackId) = 0;
public virtual void trigger() = 0;
Expand Down Expand Up @@ -10235,7 +10238,7 @@ class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook:
public facebook::react::jsinspector_modern::HostTargetDelegate& operator=(facebook::react::jsinspector_modern::HostTargetDelegate&&) = delete;
public virtual facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() = 0;
public virtual facebook::react::jsinspector_modern::HostTargetTracingDelegate* getTracingDelegate();
public virtual void captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&, const std::function<void(std::optional<std::string> base64Data)>& callback);
public virtual std::optional<std::string> captureScreenshot(const facebook::react::jsinspector_modern::HostTargetDelegate::PageCaptureScreenshotRequest&);
public virtual void loadNetworkResource(const facebook::react::jsinspector_modern::LoadNetworkResourceRequest&, facebook::react::jsinspector_modern::ScopedExecutor<facebook::react::jsinspector_modern::NetworkRequestListener>) override;
public virtual void onReload(const facebook::react::jsinspector_modern::HostTargetDelegate::PageReloadRequest& request) = 0;
public virtual void onSetPausedInDebuggerMessage(const facebook::react::jsinspector_modern::HostTargetDelegate::OverlaySetPausedInDebuggerMessageRequest& request) = 0;
Expand Down Expand Up @@ -12786,6 +12789,8 @@ class facebook::yoga::StyleSizeLength {
class facebook::yoga::StyleValueHandle {
public constexpr bool isAuto() const;
public constexpr bool isDefined() const;
public constexpr bool isPercent() const;
public constexpr bool isPoint() const;
public constexpr bool isUndefined() const;
public static constexpr facebook::yoga::StyleValueHandle ofAuto();
}
Expand All @@ -12794,6 +12799,7 @@ class facebook::yoga::StyleValuePool {
public facebook::yoga::FloatOptional getNumber(facebook::yoga::StyleValueHandle handle) const;
public facebook::yoga::StyleLength getLength(facebook::yoga::StyleValueHandle handle) const;
public facebook::yoga::StyleSizeLength getSize(facebook::yoga::StyleValueHandle handle) const;
public float getStoredValue(facebook::yoga::StyleValueHandle handle) const;
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::FloatOptional number);
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::StyleLength length);
public void store(facebook::yoga::StyleValueHandle& handle, facebook::yoga::StyleSizeLength sizeValue);
Expand Down
Loading
Loading