Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: third_party/WebKit/Source/core/animation/AnimationTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 22 matching lines...) Expand all
33 #include "core/animation/AnimationClock.h" 33 #include "core/animation/AnimationClock.h"
34 #include "core/animation/AnimationTimeline.h" 34 #include "core/animation/AnimationTimeline.h"
35 #include "core/animation/CompositorPendingAnimations.h" 35 #include "core/animation/CompositorPendingAnimations.h"
36 #include "core/animation/ElementAnimations.h" 36 #include "core/animation/ElementAnimations.h"
37 #include "core/animation/KeyframeEffect.h" 37 #include "core/animation/KeyframeEffect.h"
38 #include "core/dom/Document.h" 38 #include "core/dom/Document.h"
39 #include "core/dom/QualifiedName.h" 39 #include "core/dom/QualifiedName.h"
40 #include "core/testing/DummyPageHolder.h" 40 #include "core/testing/DummyPageHolder.h"
41 #include "platform/weborigin/KURL.h" 41 #include "platform/weborigin/KURL.h"
42 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
43 #include <memory>
43 44
44 namespace blink { 45 namespace blink {
45 46
46 class AnimationAnimationTest : public ::testing::Test { 47 class AnimationAnimationTest : public ::testing::Test {
47 protected: 48 protected:
48 void SetUp() override 49 void SetUp() override
49 { 50 {
50 setUpWithoutStartingTimeline(); 51 setUpWithoutStartingTimeline();
51 startTimeline(); 52 startTimeline();
52 } 53 }
(...skipping 28 matching lines...) Expand all
81 document->animationClock().updateTime(time); 82 document->animationClock().updateTime(time);
82 document->compositorPendingAnimations().update(false); 83 document->compositorPendingAnimations().update(false);
83 // The timeline does not know about our animation, so we have to explici tly call update(). 84 // The timeline does not know about our animation, so we have to explici tly call update().
84 return animation->update(TimingUpdateForAnimationFrame); 85 return animation->update(TimingUpdateForAnimationFrame);
85 } 86 }
86 87
87 Persistent<Document> document; 88 Persistent<Document> document;
88 Persistent<AnimationTimeline> timeline; 89 Persistent<AnimationTimeline> timeline;
89 Persistent<Animation> animation; 90 Persistent<Animation> animation;
90 TrackExceptionState exceptionState; 91 TrackExceptionState exceptionState;
91 OwnPtr<DummyPageHolder> pageHolder; 92 std::unique_ptr<DummyPageHolder> pageHolder;
92 }; 93 };
93 94
94 TEST_F(AnimationAnimationTest, InitialState) 95 TEST_F(AnimationAnimationTest, InitialState)
95 { 96 {
96 setUpWithoutStartingTimeline(); 97 setUpWithoutStartingTimeline();
97 animation = timeline->play(0); 98 animation = timeline->play(0);
98 EXPECT_EQ(Animation::Pending, animation->playStateInternal()); 99 EXPECT_EQ(Animation::Pending, animation->playStateInternal());
99 EXPECT_EQ(0, animation->currentTimeInternal()); 100 EXPECT_EQ(0, animation->currentTimeInternal());
100 EXPECT_FALSE(animation->paused()); 101 EXPECT_FALSE(animation->paused());
101 EXPECT_EQ(1, animation->playbackRate()); 102 EXPECT_EQ(1, animation->playbackRate());
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 EXPECT_EQ(Animation::Idle, animation->playStateInternal()); 817 EXPECT_EQ(Animation::Idle, animation->playStateInternal());
817 EXPECT_TRUE(std::isnan(animation->currentTime())); 818 EXPECT_TRUE(std::isnan(animation->currentTime()));
818 EXPECT_TRUE(std::isnan(animation->startTime())); 819 EXPECT_TRUE(std::isnan(animation->startTime()));
819 animation->pause(); 820 animation->pause();
820 EXPECT_EQ(Animation::Pending, animation->playStateInternal()); 821 EXPECT_EQ(Animation::Pending, animation->playStateInternal());
821 EXPECT_EQ(0, animation->currentTime()); 822 EXPECT_EQ(0, animation->currentTime());
822 EXPECT_TRUE(std::isnan(animation->startTime())); 823 EXPECT_TRUE(std::isnan(animation->startTime()));
823 } 824 }
824 825
825 } // namespace blink 826 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698