OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 12 matching lines...) Expand all Loading... |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "core/animation/Animation.h" | 31 #include "core/animation/Animation.h" |
32 | 32 |
| 33 #include <memory> |
33 #include "core/animation/AnimationClock.h" | 34 #include "core/animation/AnimationClock.h" |
34 #include "core/animation/AnimationTimeline.h" | 35 #include "core/animation/AnimationTimeline.h" |
35 #include "core/animation/CompositorPendingAnimations.h" | 36 #include "core/animation/CompositorPendingAnimations.h" |
36 #include "core/animation/ElementAnimations.h" | 37 #include "core/animation/ElementAnimations.h" |
37 #include "core/animation/KeyframeEffect.h" | 38 #include "core/animation/KeyframeEffect.h" |
| 39 #include "core/dom/DOMNodeIds.h" |
38 #include "core/dom/Document.h" | 40 #include "core/dom/Document.h" |
39 #include "core/dom/QualifiedName.h" | 41 #include "core/dom/QualifiedName.h" |
40 #include "core/testing/DummyPageHolder.h" | 42 #include "core/testing/DummyPageHolder.h" |
| 43 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h" |
41 #include "platform/weborigin/KURL.h" | 44 #include "platform/weborigin/KURL.h" |
42 #include "testing/gtest/include/gtest/gtest.h" | 45 #include "testing/gtest/include/gtest/gtest.h" |
43 #include <memory> | |
44 | 46 |
45 namespace blink { | 47 namespace blink { |
46 | 48 |
47 class AnimationAnimationTest : public ::testing::Test { | 49 class AnimationAnimationTest : public ::testing::Test { |
48 protected: | 50 protected: |
49 void SetUp() override { | 51 void SetUp() override { |
50 setUpWithoutStartingTimeline(); | 52 setUpWithoutStartingTimeline(); |
51 startTimeline(); | 53 startTimeline(); |
52 } | 54 } |
53 | 55 |
(...skipping 10 matching lines...) Expand all Loading... |
64 | 66 |
65 void startTimeline() { simulateFrame(0); } | 67 void startTimeline() { simulateFrame(0); } |
66 | 68 |
67 KeyframeEffect* makeAnimation(double duration = 30, double playbackRate = 1) { | 69 KeyframeEffect* makeAnimation(double duration = 30, double playbackRate = 1) { |
68 Timing timing; | 70 Timing timing; |
69 timing.iterationDuration = duration; | 71 timing.iterationDuration = duration; |
70 timing.playbackRate = playbackRate; | 72 timing.playbackRate = playbackRate; |
71 return KeyframeEffect::create(0, nullptr, timing); | 73 return KeyframeEffect::create(0, nullptr, timing); |
72 } | 74 } |
73 | 75 |
74 bool simulateFrame(double time) { | 76 bool simulateFrame(double time, |
| 77 Optional<CompositorElementIdSet> compositedElementIds = |
| 78 Optional<CompositorElementIdSet>()) { |
75 document->animationClock().updateTime(time); | 79 document->animationClock().updateTime(time); |
76 document->compositorPendingAnimations().update(false); | 80 document->compositorPendingAnimations().update(compositedElementIds, false); |
77 // The timeline does not know about our animation, so we have to explicitly | 81 // The timeline does not know about our animation, so we have to explicitly |
78 // call update(). | 82 // call update(). |
79 return animation->update(TimingUpdateForAnimationFrame); | 83 return animation->update(TimingUpdateForAnimationFrame); |
80 } | 84 } |
81 | 85 |
82 Persistent<Document> document; | 86 Persistent<Document> document; |
83 Persistent<AnimationTimeline> timeline; | 87 Persistent<AnimationTimeline> timeline; |
84 Persistent<Animation> animation; | 88 Persistent<Animation> animation; |
85 std::unique_ptr<DummyPageHolder> pageHolder; | 89 std::unique_ptr<DummyPageHolder> pageHolder; |
86 }; | 90 }; |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
775 animation->cancel(); | 779 animation->cancel(); |
776 EXPECT_EQ(Animation::Idle, animation->playStateInternal()); | 780 EXPECT_EQ(Animation::Idle, animation->playStateInternal()); |
777 EXPECT_TRUE(std::isnan(animation->currentTime())); | 781 EXPECT_TRUE(std::isnan(animation->currentTime())); |
778 EXPECT_TRUE(std::isnan(animation->startTime())); | 782 EXPECT_TRUE(std::isnan(animation->startTime())); |
779 animation->pause(); | 783 animation->pause(); |
780 EXPECT_EQ(Animation::Pending, animation->playStateInternal()); | 784 EXPECT_EQ(Animation::Pending, animation->playStateInternal()); |
781 EXPECT_EQ(0, animation->currentTime()); | 785 EXPECT_EQ(0, animation->currentTime()); |
782 EXPECT_TRUE(std::isnan(animation->startTime())); | 786 EXPECT_TRUE(std::isnan(animation->startTime())); |
783 } | 787 } |
784 | 788 |
| 789 TEST_F(AnimationAnimationTest, NoCompositeWithoutCompositedElementId) { |
| 790 ScopedSlimmingPaintV2ForTest enableSPv2(true); |
| 791 |
| 792 Persistent<Element> elementComposited = document->createElement("foo"); |
| 793 Persistent<Element> elementNotComposited = document->createElement("bar"); |
| 794 |
| 795 Optional<CompositorElementIdSet> compositedElementIds = |
| 796 CompositorElementIdSet(); |
| 797 CompositorElementId expectedCompositorElementId = |
| 798 createCompositorElementId(DOMNodeIds::idForNode(elementComposited), |
| 799 CompositorSubElementId::Primary); |
| 800 compositedElementIds->insert(expectedCompositorElementId); |
| 801 |
| 802 Timing timing; |
| 803 timing.iterationDuration = 30; |
| 804 timing.playbackRate = 1; |
| 805 KeyframeEffect* keyframeEffectComposited = |
| 806 KeyframeEffect::create(elementComposited.get(), nullptr, timing); |
| 807 Animation* animationComposited = timeline->play(keyframeEffectComposited); |
| 808 KeyframeEffect* keyframeEffectNotComposited = |
| 809 KeyframeEffect::create(elementNotComposited.get(), nullptr, timing); |
| 810 Animation* animationNotComposited = |
| 811 timeline->play(keyframeEffectNotComposited); |
| 812 |
| 813 simulateFrame(0, compositedElementIds); |
| 814 EXPECT_TRUE( |
| 815 animationComposited->canStartAnimationOnCompositor(compositedElementIds)); |
| 816 EXPECT_FALSE(animationNotComposited->canStartAnimationOnCompositor( |
| 817 compositedElementIds)); |
| 818 } |
| 819 |
785 } // namespace blink | 820 } // namespace blink |
OLD | NEW |