| Index: cc/trees/layer_tree_host_unittest_animation.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
|
| index 22c8965a5fd6c76b1f3e15891d48778d0ec73fdf..92c113e26b5e7149dd112805912469a14e8a91cd 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 {
|
|
|