ui: Clean up damaged rects and clear them after painting.

content/browser/compositor/reflector_impl_unittest.cc

Index: content/browser/compositor/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index a8de2d2c05991714874460e92e7fc22c02d2c6d3..a1dd7512e665715670c396b2426bfc3c753e7135 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -89,8 +89,7 @@ class TestOutputSurface : public BrowserCompositorOutputSurface {
   gfx::Size SurfaceSize() const override { return gfx::Size(256, 256); }
 };
 
-const gfx::Rect kSubRect = gfx::Rect(0, 0, 64, 64);
-const SkIRect kSkSubRect = SkIRect::MakeXYWH(0, 0, 64, 64);
+const gfx::Rect kSubRect(0, 0, 64, 64);

[sky, 2015/04/21 23:56:54]

Style guide says statics/file-locals like this should only be POD (eg not
instances).

[piman, 2015/04/22 03:32:13]

IIRC style guide allows it in unit tests.

 
 }  // namespace
 
@@ -159,10 +158,10 @@ TEST_F(ReflectorImplTest, CheckNormalOutputSurface) {
   SetUpReflector();
   UpdateTexture();
   EXPECT_TRUE(mirroring_layer_->TextureFlipped());
-  EXPECT_EQ(SkRegion(SkIRect::MakeXYWH(
-                0, output_surface_->SurfaceSize().height() - kSubRect.height(),
-                kSubRect.width(), kSubRect.height())),
-            mirroring_layer_->damaged_region());
+  gfx::Rect expected_rect =
+      kSubRect + gfx::Vector2d(0, output_surface_->SurfaceSize().height()) -
+      gfx::Vector2d(0, kSubRect.height());
+  EXPECT_EQ(expected_rect, mirroring_layer_->damaged_region());
 }
 
 TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) {
@@ -170,7 +169,7 @@ TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) {
   SetUpReflector();
   UpdateTexture();
   EXPECT_FALSE(mirroring_layer_->TextureFlipped());
-  EXPECT_EQ(SkRegion(kSkSubRect), mirroring_layer_->damaged_region());
+  EXPECT_EQ(kSubRect, mirroring_layer_->damaged_region());
 }
 
 #if defined(USE_OZONE)