diff options
| author | ksakamoto <ksakamoto@chromium.org> | 2015-05-06 20:36:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-07 03:37:07 +0000 |
| commit | 4279b872d0187987853fb1f9283486be50efe26a (patch) | |
| tree | 0a34c9abf10994ec0d5b8f1c211f22cc89ea01bc /cc/test/layer_tree_test.h | |
| parent | c3ba12345b8b97387f88dcfef91a2ff922650a72 (diff) | |
| download | chromium_src-4279b872d0187987853fb1f9283486be50efe26a.zip chromium_src-4279b872d0187987853fb1f9283486be50efe26a.tar.gz chromium_src-4279b872d0187987853fb1f9283486be50efe26a.tar.bz2 | |
Revert of cc: Adding DidFinishImplFrame to LTHI. (patchset #10 id:180001 of https://codereview.chromium.org/1111743002/)
Reason for revert:
Broke Win x64 GN build.
http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN/builds/1013/steps/compile/logs/stdio
Original issue's description:
> cc: Adding DidFinishImplFrame to LTHI.
>
> This change moves the responsibility of clearing state inside the LTHI after an
> impl frame is finished from the thread proxies to the LTHI class. This makes
> WillBeginImplFrame and DidFinishImplFrame a logical pair.
>
> This CL also;
> * Adds a test that checks the number of WillBeginImplFrame
> calls matches the DidFinishImplFrame calls.
> * Cleans up classes in cc/test/layer_tree_test.h around WillBeginImplFrame.
> * Removes the UpdateCurrentBeginFrameArgs / ResetCurrentBeginFrameArgs methods.
> * Fixes a bug where STP was calling ResetCurrentBeginFrameArgs twice every frame.
>
> BUG=346230,481810
> R=brianderson,enne
>
> Committed: https://crrev.com/2caee4f89de17858822c11379da9c6cd80f90708
> Cr-Commit-Position: refs/heads/master@{#328689}
TBR=brianderson@chromium.org,enne@chromium.org,danakj@chromium.org,sunnyps@chromium.org,mithro@mithis.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=346230,481810
Review URL: https://codereview.chromium.org/1127963003
Cr-Commit-Position: refs/heads/master@{#328692}
Diffstat (limited to 'cc/test/layer_tree_test.h')
| -rw-r--r-- | cc/test/layer_tree_test.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h index 7b48f3f..15ec215 100644 --- a/cc/test/layer_tree_test.h +++ b/cc/test/layer_tree_test.h @@ -39,7 +39,6 @@ class TestHooks : public AnimationDelegate { scoped_ptr<ResourcePool>* staging_resource_pool); virtual void WillBeginImplFrameOnThread(LayerTreeHostImpl* host_impl, const BeginFrameArgs& args) {} - virtual void DidFinishImplFrameOnThread(LayerTreeHostImpl* host_impl) {} virtual void BeginMainFrameAbortedOnThread(LayerTreeHostImpl* host_impl, CommitEarlyOutReason reason) {} virtual void BeginCommitOnThread(LayerTreeHostImpl* host_impl) {} @@ -88,8 +87,10 @@ class TestHooks : public AnimationDelegate { virtual void DidSetVisibleOnImplTree(LayerTreeHostImpl* host_impl, bool visible) {} virtual void ScheduleComposite() {} + virtual void SendBeginFramesToChildren(const BeginFrameArgs& args) {} // Hooks for SchedulerClient. + virtual void WillBeginImplFrame(const BeginFrameArgs& args) {} virtual void ScheduledActionWillSendBeginMainFrame() {} virtual void ScheduledActionSendBeginMainFrame() {} virtual void ScheduledActionDrawAndSwapIfPossible() {} @@ -98,8 +99,6 @@ class TestHooks : public AnimationDelegate { virtual void ScheduledActionBeginOutputSurfaceCreation() {} virtual void ScheduledActionPrepareTiles() {} virtual void ScheduledActionInvalidateOutputSurface() {} - virtual void SendBeginFramesToChildren(const BeginFrameArgs& args) {} - virtual void SendBeginMainFrameNotExpectedSoon() {} // Implementation of AnimationDelegate: void NotifyAnimationStarted(base::TimeTicks monotonic_time, |