Skip to content

fix Animated shutdown crash #2707

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

Merged
ahimberg merged 2 commits into from
Jul 1, 2019
Merged

fix Animated shutdown crash #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eedeadc
manually revoke Completed notification
ahimberg Jun 29, 2019
c7e07a7
fix extra copy ctor
ahimberg Jun 29, 2019
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
9 changes: 8 additions & 1 deletion vnext/ReactUWP/Modules/Animated/AnimationDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ namespace react {
}();
}

AnimationDriver::~AnimationDriver()
{
if (m_scopedBatch)
m_scopedBatch.Completed(m_scopedBatchCompletedToken);
}

void AnimationDriver::StartAnimation()
{
const auto [animation, scopedBatch] = MakeAnimation(m_config);
Expand All @@ -32,7 +38,7 @@ namespace react {
}
scopedBatch.End();

scopedBatch.Completed([endCallback = m_endCallback, animatedValue, id = m_id](auto sender, auto)
m_scopedBatchCompletedToken = scopedBatch.Completed([endCallback = m_endCallback, animatedValue, id = m_id](auto sender, auto)
{
if (endCallback)
{
Expand All @@ -45,6 +51,7 @@ namespace react {
});

m_animation = animation;
m_scopedBatch = scopedBatch;
}

void AnimationDriver::StopAnimation()
Expand Down
2 changes: 2 additions & 0 deletions vnext/ReactUWP/Modules/Animated/AnimationDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace react { namespace uwp {
{
public:
AnimationDriver(int64_t id, int64_t animatedValueTag, const Callback& endCallback, const folly::dynamic& config, const std::shared_ptr<NativeAnimatedNodeManager>& manager);
virtual ~AnimationDriver();
void StartAnimation();
void StopAnimation();

Expand All @@ -35,6 +36,7 @@ namespace react { namespace uwp {
std::weak_ptr<NativeAnimatedNodeManager> m_manager{};

winrt::Windows::UI::Composition::CompositionAnimation m_animation{ nullptr };
winrt::Windows::UI::Composition::CompositionScopedBatch m_scopedBatch{ nullptr };
//auto revoker for scopedBatch.Completed is broken, tracked by internal bug #22399779
winrt::event_token m_scopedBatchCompletedToken{};
};
Expand Down
30 changes: 15 additions & 15 deletions vnext/ReactUWP/Modules/Animated/NativeAnimatedNodeManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,57 +39,57 @@ namespace react {
{
case AnimatedNodeType::Style:
{
m_styleNodes.emplace(tag, std::make_unique<StyleAnimatedNode>(StyleAnimatedNode(tag, config, manager)));
m_styleNodes.emplace(tag, std::make_unique<StyleAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Value:
{
m_valueNodes.emplace(tag, std::make_unique<ValueAnimatedNode>(ValueAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<ValueAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Props:
{
m_propsNodes.emplace(tag, std::make_unique<PropsAnimatedNode>(PropsAnimatedNode(tag, config, instance, manager)));
m_propsNodes.emplace(tag, std::make_unique<PropsAnimatedNode>(tag, config, instance, manager));
break;
}
case AnimatedNodeType::Interpolation:
{
m_valueNodes.emplace(tag, std::make_unique<InterpolationAnimatedNode>(InterpolationAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<InterpolationAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Addition:
{
m_valueNodes.emplace(tag, std::make_unique<AdditionAnimatedNode>(AdditionAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<AdditionAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Subtraction:
{
m_valueNodes.emplace(tag, std::make_unique<SubtractionAnimatedNode>(SubtractionAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<SubtractionAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Division:
{
m_valueNodes.emplace(tag, std::make_unique<DivisionAnimatedNode>(DivisionAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<DivisionAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Multiplication:
{
m_valueNodes.emplace(tag, std::make_unique<MultiplicationAnimatedNode>(MultiplicationAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<MultiplicationAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Modulus:
{
m_valueNodes.emplace(tag, std::make_unique<ModulusAnimatedNode>(ModulusAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<ModulusAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Diffclamp:
{
m_valueNodes.emplace(tag, std::make_unique<DiffClampAnimatedNode>(DiffClampAnimatedNode(tag, config, manager)));
m_valueNodes.emplace(tag, std::make_unique<DiffClampAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Transform:
{
m_transformNodes.emplace(tag, std::make_unique<TransformAnimatedNode>(TransformAnimatedNode(tag, config, manager)));
m_transformNodes.emplace(tag, std::make_unique<TransformAnimatedNode>(tag, config, manager));
break;
}
case AnimatedNodeType::Tracking:
Expand Down Expand Up @@ -147,10 +147,10 @@ namespace react {
switch (AnimationTypeFromString(animationConfig.find("type").dereference().second.getString()))
{
case AnimationType::Decay:
m_activeAnimations.emplace(animationId, std::make_unique<DecayAnimationDriver>(DecayAnimationDriver(animationId, animatedNodeTag, endCallback, animationConfig, manager)));
m_activeAnimations.emplace(animationId, std::make_unique<DecayAnimationDriver>(animationId, animatedNodeTag, endCallback, animationConfig, manager));
break;
case AnimationType::Frames:
m_activeAnimations.emplace(animationId, std::make_unique<FrameAnimationDriver>(FrameAnimationDriver(animationId, animatedNodeTag, endCallback, animationConfig, manager)));
m_activeAnimations.emplace(animationId, std::make_unique<FrameAnimationDriver>(animationId, animatedNodeTag, endCallback, animationConfig, manager));
break;
case AnimationType::Spring:
//TODO: implement spring animations tracked by issue #2681
Expand Down Expand Up @@ -214,12 +214,12 @@ namespace react {
const auto key = std::make_tuple(viewTag, eventName);
if (m_eventDrivers.count(key))
{
m_eventDrivers.at(key).emplace_back(std::make_unique<EventAnimationDriver>(EventAnimationDriver(pathList, valueNodeTag, manager)));
m_eventDrivers.at(key).emplace_back(std::make_unique<EventAnimationDriver>(pathList, valueNodeTag, manager));
}
else
{
auto vector = std::vector<std::unique_ptr<EventAnimationDriver>>{};
vector.emplace_back(std::make_unique<EventAnimationDriver>(EventAnimationDriver(pathList, valueNodeTag, manager)));
vector.emplace_back(std::make_unique<EventAnimationDriver>(pathList, valueNodeTag, manager));
m_eventDrivers.insert({ key, std::move(vector) });
}
}
Expand Down