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/output | |
| 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/output')
| -rw-r--r-- | cc/output/delegating_renderer_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc index ffa7e4f..a1d21d4 100644 --- a/cc/output/delegating_renderer_unittest.cc +++ b/cc/output/delegating_renderer_unittest.cc @@ -39,10 +39,10 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest { virtual void AfterTest() OVERRIDE {} - virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, - LayerTreeHostImpl::FrameData* frame, - bool result) - OVERRIDE { + virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread( + LayerTreeHostImpl* host_impl, + LayerTreeHostImpl::FrameData* frame, + DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE { EXPECT_EQ(0u, output_surface_->num_sent_frames()); const CompositorFrame& last_frame = output_surface_->last_sent_frame(); @@ -50,7 +50,7 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest { EXPECT_FALSE(last_frame.gl_frame_data); EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor); EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor); - return true; + return DrawSwapReadbackResult::DRAW_SUCCESS; } virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { @@ -89,10 +89,10 @@ class DelegatingRendererTestResources : public DelegatingRendererTest { virtual void AfterTest() OVERRIDE {} - virtual bool PrepareToDrawOnThread( + virtual DrawSwapReadbackResult::DrawResult PrepareToDrawOnThread( LayerTreeHostImpl* host_impl, LayerTreeHostImpl::FrameData* frame, - bool result) OVERRIDE { + DrawSwapReadbackResult::DrawResult draw_result) OVERRIDE { frame->render_passes.clear(); frame->render_passes_by_id.clear(); @@ -111,7 +111,7 @@ class DelegatingRendererTestResources : public DelegatingRendererTest { gfx::Transform()); pass->AppendOneOfEveryQuadType( host_impl->resource_provider(), child_pass->id); - return true; + return draw_result; } virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |