| 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 33ff66f3e7a296faa9f7af2cb2a3a2288c642775..7133c217a77d061e78007a2c8d1118fab71f5daa 100644
|
| --- a/cc/trees/layer_tree_host_unittest_damage.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_damage.cc
|
| @@ -56,8 +56,7 @@ class LayerTreeHostDamageTestSetNeedsRedraw
|
|
|
| RenderSurfaceImpl* root_surface =
|
| impl->active_tree()->root_layer_for_testing()->render_surface();
|
| - gfx::Rect root_damage =
|
| - root_surface->damage_tracker()->current_damage_rect();
|
| + gfx::Rect root_damage = root_surface->damage_tracker()->CurrentDamageRect();
|
|
|
| switch (draw_count_) {
|
| case 0:
|
| @@ -118,8 +117,7 @@ class LayerTreeHostDamageTestSetViewportSize
|
|
|
| RenderSurfaceImpl* root_surface =
|
| impl->active_tree()->root_layer_for_testing()->render_surface();
|
| - gfx::Rect root_damage =
|
| - root_surface->damage_tracker()->current_damage_rect();
|
| + gfx::Rect root_damage = root_surface->damage_tracker()->CurrentDamageRect();
|
|
|
| switch (draw_count_) {
|
| case 0:
|
| @@ -259,8 +257,7 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
|
|
|
| RenderSurfaceImpl* root_surface =
|
| host_impl->active_tree()->root_layer_for_testing()->render_surface();
|
| - gfx::Rect root_damage =
|
| - root_surface->damage_tracker()->current_damage_rect();
|
| + gfx::Rect root_damage = root_surface->damage_tracker()->CurrentDamageRect();
|
| root_damage.Intersect(root_surface->content_rect());
|
|
|
| int source_frame = host_impl->active_tree()->source_frame_number();
|
| @@ -384,8 +381,7 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
| RenderSurfaceImpl* root_surface =
|
| host_impl->active_tree()->root_layer_for_testing()->render_surface();
|
| - gfx::Rect root_damage =
|
| - root_surface->damage_tracker()->current_damage_rect();
|
| + gfx::Rect root_damage = root_surface->damage_tracker()->CurrentDamageRect();
|
| root_damage.Intersect(root_surface->content_rect());
|
| switch (num_draws_) {
|
| case 0:
|
| @@ -468,8 +464,7 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
|
| EXPECT_EQ(DRAW_SUCCESS, draw_result);
|
| RenderSurfaceImpl* root_surface =
|
| host_impl->active_tree()->root_layer_for_testing()->render_surface();
|
| - gfx::Rect root_damage =
|
| - root_surface->damage_tracker()->current_damage_rect();
|
| + gfx::Rect root_damage = root_surface->damage_tracker()->CurrentDamageRect();
|
| root_damage.Intersect(root_surface->content_rect());
|
| int frame = host_impl->active_tree()->source_frame_number();
|
| switch (num_draws_) {
|
|
|