cc: Ensure that large damage doesn't register as "frame has no damage"

cc/trees/layer_tree_host_unittest_damage.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/time/time.h"
@@ skipping 38 matching lines @@
     }
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     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:
         // The first frame has full damage.
         EXPECT_EQ(gfx::Rect(10, 10), root_damage);
         break;
       case 1:
         // The second frame has full damage.
         EXPECT_EQ(gfx::Rect(10, 10), root_damage);
         EndTest();
@@ skipping 40 matching lines @@
     }
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     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:
         // The first frame has full damage.
         EXPECT_EQ(gfx::Rect(10, 10), root_damage);
         break;
       case 1:
         // The second frame has full damage.
         EXPECT_EQ(gfx::Rect(15, 15), root_damage);
         EndTest();
@@ skipping 119 matching lines @@
     client_.set_bounds(root_->bounds());
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     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 source_frame = host_impl->active_tree()->source_frame_number();
     switch (source_frame) {
       case 0:
         // The first frame draws and clears any damage.
         EXPECT_EQ(root_surface->content_rect(), root_damage);
         EXPECT_FALSE(frame_data->has_no_damage);
         break;
       case 1:
@@ skipping 103 matching lines @@
     num_draws_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     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:
         // The first frame has damage, so we should draw and swap.
         break;
       case 1:
         // The second frame should not damage the scrollbars.
         EXPECT_FALSE(root_damage.Intersects(gfx::Rect(300, 300, 10, 100)));
         break;
       case 2:
@@ skipping 62 matching lines @@
     num_draws_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     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_) {
       case 0:
         // The first frame has damage, so we should draw and swap.
         EXPECT_EQ(0, frame);
         break;
       case 1:
         // The second frame has scrolled, so the scrollbar should be damaged.
         EXPECT_EQ(0, frame);
@@ skipping 38 matching lines @@
 
   void AfterTest() override { EXPECT_EQ(3, num_draws_); }
 
   int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage);
 
 }  // namespace
 }  // namespace cc