| Index: cc/trees/layer_tree_host_unittest_damage.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
|
| index daff40beb2dec4bff98288a3a946901ffa4f83fc..39b29844b6bdc39b9d87c6fc3753452b29fcefc2 100644
|
| --- a/cc/trees/layer_tree_host_unittest_damage.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_damage.cc
|
| @@ -49,7 +49,7 @@ class LayerTreeHostDamageTestSetNeedsRedraw
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
|
|
| @@ -110,7 +110,7 @@ class LayerTreeHostDamageTestSetViewportSize
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
|
|
| @@ -168,7 +168,7 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
|
|
| @@ -253,7 +253,7 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
|
|
| @@ -394,7 +394,7 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
| RenderSurfaceImpl* root_surface =
|
| @@ -465,7 +465,7 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
|
| }
|
|
|
| DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
|
| - LayerTreeHostImpl::FrameData* frame_data,
|
| + FrameData* frame_data,
|
| DrawResult draw_result) override {
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
| RenderSurfaceImpl* root_surface =
|
|
|