diff options
Diffstat (limited to 'cc/test')
-rw-r--r-- | cc/test/fake_proxy.h | 1 | ||||
-rw-r--r-- | cc/test/layer_tree_test.cc | 6 | ||||
-rw-r--r-- | cc/test/layer_tree_test.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h index 4ddf4cf..bcde11e 100644 --- a/cc/test/fake_proxy.h +++ b/cc/test/fake_proxy.h @@ -28,6 +28,7 @@ class FakeProxy : public Proxy { virtual void SetVisible(bool visible) OVERRIDE {} virtual void CreateAndInitializeOutputSurface() OVERRIDE; virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE; + virtual void SetNeedsAnimate() OVERRIDE {} virtual void SetNeedsUpdateLayers() OVERRIDE {} virtual void SetNeedsCommit() OVERRIDE {} virtual void SetNeedsRedraw(gfx::Rect damage_rect) OVERRIDE {} diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index f595458..b723c56 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -515,10 +515,6 @@ void LayerTreeTest::ScheduleComposite() { base::Bind(&LayerTreeTest::DispatchComposite, main_thread_weak_ptr_)); } -void LayerTreeTest::ScheduleAnimation() { - ScheduleComposite(); -} - void LayerTreeTest::RealEndTest() { if (layer_tree_host_ && proxy()->CommitPendingForTesting()) { main_task_runner_->PostTask( @@ -605,7 +601,7 @@ void LayerTreeTest::DispatchSetNextCommitForcesRedraw() { DCHECK(!proxy() || proxy()->IsMainThread()); if (layer_tree_host_) - layer_tree_host_->set_next_commit_forces_redraw(); + layer_tree_host_->SetNextCommitForcesRedraw(); } void LayerTreeTest::DispatchComposite() { diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h index 08e4514..dd5a8d5 100644 --- a/cc/test/layer_tree_test.h +++ b/cc/test/layer_tree_test.h @@ -137,7 +137,6 @@ class LayerTreeTest : public testing::Test, public TestHooks { virtual void InitializeSettings(LayerTreeSettings* settings) {} virtual void ScheduleComposite() OVERRIDE; - virtual void ScheduleAnimation() OVERRIDE; void RealEndTest(); |