| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 93ddf120d4cdd968155e3d0f308d4d110c0c267a..cbb15669f88d9e1940f3a31df879e51296e407ba 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -81,11 +81,6 @@ class ThreadProxyForTest : public ThreadProxy {
|
| private:
|
| TestHooks* test_hooks_;
|
|
|
| - void WillBeginImplFrame(const BeginFrameArgs& args) override {
|
| - ThreadProxy::WillBeginImplFrame(args);
|
| - test_hooks_->WillBeginImplFrame(args);
|
| - }
|
| -
|
| void ScheduledActionSendBeginMainFrame() override {
|
| test_hooks_->ScheduledActionWillSendBeginMainFrame();
|
| ThreadProxy::ScheduledActionSendBeginMainFrame();
|
| @@ -123,6 +118,11 @@ class ThreadProxyForTest : public ThreadProxy {
|
| test_hooks_->ScheduledActionInvalidateOutputSurface();
|
| }
|
|
|
| + void SendBeginMainFrameNotExpectedSoon() override {
|
| + ThreadProxy::SendBeginMainFrameNotExpectedSoon();
|
| + test_hooks_->SendBeginMainFrameNotExpectedSoon();
|
| + }
|
| +
|
| ThreadProxyForTest(
|
| TestHooks* test_hooks,
|
| LayerTreeHost* host,
|
| @@ -154,11 +154,6 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
|
| private:
|
| TestHooks* test_hooks_;
|
|
|
| - void WillBeginImplFrame(const BeginFrameArgs& args) override {
|
| - SingleThreadProxy::WillBeginImplFrame(args);
|
| - test_hooks_->WillBeginImplFrame(args);
|
| - }
|
| -
|
| void ScheduledActionSendBeginMainFrame() override {
|
| test_hooks_->ScheduledActionWillSendBeginMainFrame();
|
| SingleThreadProxy::ScheduledActionSendBeginMainFrame();
|
| @@ -192,6 +187,16 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
|
| test_hooks_->ScheduledActionPrepareTiles();
|
| }
|
|
|
| + void ScheduledActionInvalidateOutputSurface() override {
|
| + SingleThreadProxy::ScheduledActionInvalidateOutputSurface();
|
| + test_hooks_->ScheduledActionInvalidateOutputSurface();
|
| + }
|
| +
|
| + void SendBeginMainFrameNotExpectedSoon() override {
|
| + SingleThreadProxy::SendBeginMainFrameNotExpectedSoon();
|
| + test_hooks_->SendBeginMainFrameNotExpectedSoon();
|
| + }
|
| +
|
| SingleThreadProxyForTest(
|
| TestHooks* test_hooks,
|
| LayerTreeHost* host,
|
| @@ -255,6 +260,11 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| test_hooks_->WillBeginImplFrameOnThread(this, args);
|
| }
|
|
|
| + void DidBeginImplFrameDeadline() override {
|
| + LayerTreeHostImpl::DidBeginImplFrameDeadline();
|
| + test_hooks_->DidBeginImplFrameDeadlineOnThread(this);
|
| + }
|
| +
|
| void BeginMainFrameAborted(CommitEarlyOutReason reason) override {
|
| LayerTreeHostImpl::BeginMainFrameAborted(reason);
|
| test_hooks_->BeginMainFrameAbortedOnThread(this, reason);
|
|
|