diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 07:22:11 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 07:22:11 +0000 |
commit | 7ddfe7e8b52738e4f52030a9c030376d50c99a82 (patch) | |
tree | 7045fe4fd328064317532e3367be8349e19969c2 /cc/trees/layer_tree_host_unittest_animation.cc | |
parent | 0f5d5bb23c132494114444fae1539e05ec4a3523 (diff) | |
download | chromium_src-7ddfe7e8b52738e4f52030a9c030376d50c99a82.zip chromium_src-7ddfe7e8b52738e4f52030a9c030376d50c99a82.tar.gz chromium_src-7ddfe7e8b52738e4f52030a9c030376d50c99a82.tar.bz2 |
cc: Make PrepareToDraw return an enum for why it aborts
This is mostly a cosmetic patch to change a boolean into an enum.
BUG=335289
Review URL: https://codereview.chromium.org/131683005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_animation.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest_animation.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index 22c8965..92c113e 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc @@ -201,11 +201,11 @@ class LayerTreeHostAnimationTestCheckerboardDoesNotStarveDraws EndTest(); } - virtual bool PrepareToDrawOnThread( + virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread( LayerTreeHostImpl* host_impl, LayerTreeHostImpl::FrameData* frame, - bool result) OVERRIDE { - return false; + DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE { + return DrawSwapReadbackResult::DRAW_ABORTED_CHECKERBOARD_ANIMATIONS; } virtual void AfterTest() OVERRIDE { } @@ -893,16 +893,17 @@ class LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations PostSetNeedsCommitToMainThread(); } - virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, - LayerTreeHostImpl::FrameData* frame_data, - bool result) OVERRIDE { + virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread( + LayerTreeHostImpl* host_impl, + LayerTreeHostImpl::FrameData* frame_data, + DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE { if (added_animations_ < 2) - return result; + return draw_result; if (TestEnded()) - return result; + return draw_result; // Act like there is checkerboard when the second animation wants to draw. ++prevented_draw_; - return false; + return DrawSwapReadbackResult::DRAW_ABORTED_CHECKERBOARD_ANIMATIONS; } virtual void DidCommitAndDrawFrame() OVERRIDE { |