| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 10c415e8c19696a6e7e6c5c66d59b20463ed4121..8383126f9b03fc2d841c927cc909815dee4443f7 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -69,26 +69,31 @@ class ThreadProxyForTest : public ThreadProxy {
|
| private:
|
| TestHooks* test_hooks_;
|
|
|
| - virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {
|
| - ThreadProxy::ScheduledActionBeginOutputSurfaceCreation();
|
| - test_hooks_->ScheduledActionBeginOutputSurfaceCreation();
|
| - }
|
| -
|
| virtual void ScheduledActionSendBeginMainFrame() OVERRIDE {
|
| test_hooks_->ScheduledActionWillSendBeginMainFrame();
|
| ThreadProxy::ScheduledActionSendBeginMainFrame();
|
| test_hooks_->ScheduledActionSendBeginMainFrame();
|
| }
|
|
|
| + virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
|
| + DrawResult result = ThreadProxy::ScheduledActionDrawAndSwapIfPossible();
|
| + test_hooks_->ScheduledActionDrawAndSwapIfPossible();
|
| + return result;
|
| + }
|
| +
|
| + virtual void ScheduledActionAnimate() OVERRIDE {
|
| + ThreadProxy::ScheduledActionAnimate();
|
| + test_hooks_->ScheduledActionAnimate();
|
| + }
|
| +
|
| virtual void ScheduledActionCommit() OVERRIDE {
|
| ThreadProxy::ScheduledActionCommit();
|
| test_hooks_->ScheduledActionCommit();
|
| }
|
|
|
| - virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
|
| - DrawResult result = ThreadProxy::ScheduledActionDrawAndSwapIfPossible();
|
| - test_hooks_->ScheduledActionDrawAndSwapIfPossible();
|
| - return result;
|
| + virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {
|
| + ThreadProxy::ScheduledActionBeginOutputSurfaceCreation();
|
| + test_hooks_->ScheduledActionBeginOutputSurfaceCreation();
|
| }
|
|
|
| ThreadProxyForTest(
|
|
|