summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorvmpstr <vmpstr@chromium.org>2014-12-03 08:10:06 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-03 16:10:31 +0000
commitedb488ed1a6bf27fc0233de3d47edc5fbb623e41 (patch)
tree71bd1f76811a41cb3f7b4f0baa6a58b71a85e774 /cc/test
parent818249d21cfe4de609a96385008fa14d17e5aa13 (diff)
downloadchromium_src-edb488ed1a6bf27fc0233de3d47edc5fbb623e41.zip
chromium_src-edb488ed1a6bf27fc0233de3d47edc5fbb623e41.tar.gz
chromium_src-edb488ed1a6bf27fc0233de3d47edc5fbb623e41.tar.bz2
cc: Ensure to issue only one NotifiyReadyTo* callback per manage tiles.
This patch ensures that we only issue a single notification that we're ready to either activate or draw per manage tiles call. Previously it was possible that we might issue extra notifications due to tile manager's internal rescheduling. Comes with a test that fails without the patch and passes with the patch. R=reveman, danakj Review URL: https://codereview.chromium.org/779443003 Cr-Commit-Position: refs/heads/master@{#306616}
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/layer_tree_test.cc5
-rw-r--r--cc/test/layer_tree_test.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index fb16917..5be1240 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -153,6 +153,11 @@ class ThreadProxyForTest : public ThreadProxy {
test_hooks_->ScheduledActionBeginOutputSurfaceCreation();
}
+ void ScheduledActionManageTiles() override {
+ ThreadProxy::ScheduledActionManageTiles();
+ test_hooks_->ScheduledActionManageTiles();
+ }
+
ThreadProxyForTest(
TestHooks* test_hooks,
LayerTreeHost* host,
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 2914cfc..863100b 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -98,6 +98,7 @@ class TestHooks : public AnimationDelegate {
virtual void ScheduledActionAnimate() {}
virtual void ScheduledActionCommit() {}
virtual void ScheduledActionBeginOutputSurfaceCreation() {}
+ virtual void ScheduledActionManageTiles() {}
// Implementation of AnimationDelegate:
void NotifyAnimationStarted(base::TimeTicks monotonic_time,