| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 373f92bdfe95cdec3a43302849a999db4690ac65..a253782e0d5dd91b00bbd57fd1ee60331fcdb820 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -35,10 +35,11 @@ TestHooks::TestHooks() {}
|
|
|
| TestHooks::~TestHooks() {}
|
|
|
| -bool TestHooks::PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| - bool result) {
|
| - return true;
|
| +DrawSwapReadbackResult::DrawResult TestHooks::PrepareToDrawOnThread(
|
| + LayerTreeHostImpl* host_impl,
|
| + LayerTreeHostImpl::FrameData* frame_data,
|
| + DrawSwapReadbackResult::DrawResult draw_result) {
|
| + return draw_result;
|
| }
|
|
|
| base::TimeDelta TestHooks::LowFrequencyAnimationInterval() const {
|
| @@ -101,12 +102,12 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| }
|
| }
|
|
|
| - virtual bool PrepareToDraw(FrameData* frame,
|
| - const gfx::Rect& damage_rect) OVERRIDE {
|
| - bool result = LayerTreeHostImpl::PrepareToDraw(frame, damage_rect);
|
| - if (!test_hooks_->PrepareToDrawOnThread(this, frame, result))
|
| - result = false;
|
| - return result;
|
| + virtual DrawSwapReadbackResult::DrawResult PrepareToDraw(
|
| + FrameData* frame,
|
| + const gfx::Rect& damage_rect) OVERRIDE {
|
| + DrawSwapReadbackResult::DrawResult draw_result =
|
| + LayerTreeHostImpl::PrepareToDraw(frame, damage_rect);
|
| + return test_hooks_->PrepareToDrawOnThread(this, frame, draw_result);
|
| }
|
|
|
| virtual void DrawLayers(FrameData* frame,
|
|
|