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_delegated.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_delegated.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest_delegated.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc index 7b0926f..7c42b80 100644 --- a/cc/trees/layer_tree_host_unittest_delegated.cc +++ b/cc/trees/layer_tree_host_unittest_delegated.cc @@ -709,13 +709,14 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage first_draw_for_source_frame_ = true; } - virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, - LayerTreeHostImpl::FrameData* frame, - bool result) OVERRIDE { - EXPECT_TRUE(result); + virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread( + LayerTreeHostImpl* host_impl, + LayerTreeHostImpl::FrameData* frame, + DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE { + EXPECT_EQ(DrawSwapReadbackResult::DRAW_SUCCESS, draw_result); if (!first_draw_for_source_frame_) - return result; + return draw_result; gfx::RectF damage_rect; if (!frame->has_no_damage) { @@ -811,7 +812,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage break; } - return result; + return draw_result; } protected: |