diff options
| author | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 00:46:12 +0000 |
|---|---|---|
| committer | mfomitchev@chromium.org <mfomitchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 00:46:12 +0000 |
| commit | b24d03bd41a7d971b575e5840833a21f5ee227ea (patch) | |
| tree | 460671004bd728d16af7f323f3e6e2178cb141e9 /ui/compositor/layer_animator_unittest.cc | |
| parent | 00eca37473c4b863040671fd1092b7fc43ba833a (diff) | |
| download | chromium_src-b24d03bd41a7d971b575e5840833a21f5ee227ea.zip chromium_src-b24d03bd41a7d971b575e5840833a21f5ee227ea.tar.gz chromium_src-b24d03bd41a7d971b575e5840833a21f5ee227ea.tar.bz2 | |
Replacing raw pointer to LayerAnimator with scoped_refptr in ScopedLayerAnimationSettings.
The raw pointer can cause issues: if the ScopedLayerAnimationSettings object survives the
respective LayerAnimator object, a seg fault occurs when ScopedLayerAnimationSettings is deleted.
This is particularly problematic when the animation in question has a 0 duration (which can be
the case for unit tests). When animation's duration is 0, the Animator gets deleted right away,
by the same setter that starts the animation.
BUG=
Review URL: https://codereview.chromium.org/185793005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor/layer_animator_unittest.cc')
| -rw-r--r-- | ui/compositor/layer_animator_unittest.cc | 59 |
1 files changed, 57 insertions, 2 deletions
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index ed73965..03800fd 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -120,12 +120,41 @@ class DeletingLayerAnimationObserver : public LayerAnimationObserver { DISALLOW_COPY_AND_ASSIGN(DeletingLayerAnimationObserver); }; +class LayerAnimatorDestructionObserver { + public: + LayerAnimatorDestructionObserver() : animator_deleted_(false) {} + virtual ~LayerAnimatorDestructionObserver() {} + + void NotifyAnimatorDeleted() { + animator_deleted_ = true; + } + + bool IsAnimatorDeleted() { + return animator_deleted_; + } + + private: + bool animator_deleted_; + + DISALLOW_COPY_AND_ASSIGN(LayerAnimatorDestructionObserver); +}; + class TestLayerAnimator : public LayerAnimator { public: - TestLayerAnimator() : LayerAnimator(base::TimeDelta::FromSeconds(0)) {} + TestLayerAnimator() : LayerAnimator(base::TimeDelta::FromSeconds(0)), + destruction_observer_(NULL) {} + + void SetDestructionObserver( + LayerAnimatorDestructionObserver* observer) { + destruction_observer_ = observer; + } protected: - virtual ~TestLayerAnimator() {} + virtual ~TestLayerAnimator() { + if (destruction_observer_) { + destruction_observer_->NotifyAnimatorDeleted(); + } + } virtual void ProgressAnimation(LayerAnimationSequence* sequence, base::TimeTicks now) OVERRIDE { @@ -134,6 +163,8 @@ class TestLayerAnimator : public LayerAnimator { } private: + LayerAnimatorDestructionObserver* destruction_observer_; + DISALLOW_COPY_AND_ASSIGN(TestLayerAnimator); }; @@ -1642,6 +1673,30 @@ TEST(LayerAnimatorTest, InterruptedImplicitAnimationObservers) { EXPECT_FLOAT_EQ(1.0f, delegate.GetBrightnessForAnimation()); } +// Tests that LayerAnimator is not deleted after the animation completes as long +// as there is a live ScopedLayerAnimationSettings object wrapped around it. +TEST(LayerAnimatorTest, AnimatorKeptAliveBySettings) { + // Note we are using a raw pointer unlike in other tests. + TestLayerAnimator* animator = new TestLayerAnimator(); + LayerAnimatorDestructionObserver destruction_observer; + animator->SetDestructionObserver(&destruction_observer); + AnimationContainerElement* element = animator; + animator->set_disable_timer_for_test(true); + TestLayerAnimationDelegate delegate; + animator->SetDelegate(&delegate); + { + // ScopedLayerAnimationSettings should keep the Animator alive as long as + // it is alive, even beyond the end of the animation. + ScopedLayerAnimationSettings settings(animator); + base::TimeTicks now = gfx::FrameTime::Now(); + animator->SetBrightness(0.5); + element->Step(now + base::TimeDelta::FromSeconds(1)); + EXPECT_FALSE(destruction_observer.IsAnimatorDeleted()); + } + // ScopedLayerAnimationSettings was destroyed, so Animator should be deleted. + EXPECT_TRUE(destruction_observer.IsAnimatorDeleted()); +} + // Tests that an observer added to a scoped settings object is not notified // when the animator is destroyed unless explicitly requested. TEST(LayerAnimatorTest, ImplicitObserversAtAnimatorDestruction) { |