| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index 7b0926fbf79ef2478c9c0f304dfe71aa422dc052..7c42b80b49c5f9683f6e6ea7c63c181135a153f6 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:
|
|
|