summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_unittest_animation.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 22:13:52 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 22:13:52 +0000
commit3cae03e46fe52323a347e2c18f17b4dc8ca20396 (patch)
treec01f95f6937f94e33f42de0c9308c98619008192 /cc/trees/layer_tree_host_unittest_animation.cc
parent1e3085fb1f75fa65dbd7ce58ce8e87069d86e8a6 (diff)
downloadchromium_src-3cae03e46fe52323a347e2c18f17b4dc8ca20396.zip
chromium_src-3cae03e46fe52323a347e2c18f17b4dc8ca20396.tar.gz
chromium_src-3cae03e46fe52323a347e2c18f17b4dc8ca20396.tar.bz2
cc: Create a AnimationDelegate interface and an adapter class in compositor_bindings.
Instead of having cc/ talk directly to the WebKit::WebAnimationDelegate, we create an abstract interface in cc/ that it can talk to. In the compositor_bindings, we implement this class, and forward the function calls made into it over to the WebKit implementation. BUG=None TEST=cc_unittests, webkit_compositor_bindings_unittests R=jamesr@chromium.org Review URL: https://codereview.chromium.org/17755003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_animation.cc')
-rw-r--r--cc/trees/layer_tree_host_unittest_animation.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index 29cc4f4..df283de 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -148,7 +148,7 @@ class LayerTreeHostAnimationTestAddAnimation
}
}
- virtual void notifyAnimationStarted(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationStarted(double wall_clock_time) OVERRIDE {
received_animation_started_notification_ = true;
start_time_ = wall_clock_time;
if (num_animates_) {
@@ -239,7 +239,7 @@ class LayerTreeHostAnimationTestAnimationsGetDeleted
EndTest();
}
- virtual void notifyAnimationFinished(double time) OVERRIDE {
+ virtual void NotifyAnimationFinished(double time) OVERRIDE {
// Animations on the impl-side controller only get deleted during a commit,
// so we need to schedule a commit.
layer_tree_host()->SetNeedsCommit();
@@ -372,7 +372,7 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes
PostAddAnimationToMainThread(content_.get());
}
- virtual void notifyAnimationStarted(double time) OVERRIDE {
+ virtual void NotifyAnimationStarted(double time) OVERRIDE {
LayerAnimationController* controller =
layer_tree_host()->root_layer()->children()[0]->
layer_animation_controller();
@@ -427,7 +427,7 @@ class LayerTreeHostAnimationTestAnimationFinishedEvents
PostAddInstantAnimationToMainThread(layer_tree_host()->root_layer());
}
- virtual void notifyAnimationFinished(double time) OVERRIDE {
+ virtual void NotifyAnimationFinished(double time) OVERRIDE {
LayerAnimationController* controller =
layer_tree_host()->root_layer()->layer_animation_controller();
Animation* animation =
@@ -643,11 +643,11 @@ class LayerTreeHostAnimationTestRunAnimationWhenNotCanDraw
PostAddAnimationToMainThread(content_.get());
}
- virtual void notifyAnimationStarted(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationStarted(double wall_clock_time) OVERRIDE {
started_times_++;
}
- virtual void notifyAnimationFinished(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationFinished(double wall_clock_time) OVERRIDE {
EndTest();
}
@@ -689,12 +689,12 @@ class LayerTreeHostAnimationTestRunAnimationWhenNotVisible
layer_tree_host()->SetVisible(false);
}
- virtual void notifyAnimationStarted(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationStarted(double wall_clock_time) OVERRIDE {
EXPECT_FALSE(visible_);
started_times_++;
}
- virtual void notifyAnimationFinished(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationFinished(double wall_clock_time) OVERRIDE {
EXPECT_FALSE(visible_);
EXPECT_EQ(1, started_times_);
EndTest();
@@ -773,13 +773,13 @@ class LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations
}
}
- virtual void notifyAnimationStarted(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationStarted(double wall_clock_time) OVERRIDE {
if (TestEnded())
return;
started_times_++;
}
- virtual void notifyAnimationFinished(double wall_clock_time) OVERRIDE {
+ virtual void NotifyAnimationFinished(double wall_clock_time) OVERRIDE {
// We should be checkerboarding already, but it should still finish the
// first animation.
EXPECT_EQ(2, added_animations_);