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

content/browser/compositor/reflector_impl_unittest.cc

 // Copyright 2015 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 "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
@@ skipping 71 matching lines @@
 
 #if defined(OS_MACOSX)
   void OnSurfaceDisplayed() override {}
   void OnSurfaceRecycled() override {}
   bool ShouldNotShowFramesAfterRecycle() const override { return false; }
 #endif
 
   gfx::Size SurfaceSize() const override { return gfx::Size(256, 256); }
 };
 
-const gfx::Rect kSubRect(0, 0, 64, 64);
+const gfx::Rect kSubRect = gfx::Rect(0, 0, 64, 64);
+const SkIRect kSkSubRect = SkIRect::MakeXYWH(0, 0, 64, 64);
 
 }  // namespace
 
 class ReflectorImplTest : public testing::Test {
  public:
   void SetUp() override {
     bool enable_pixel_output = false;
     ui::ContextFactory* context_factory =
         ui::InitializeContextFactoryForTests(enable_pixel_output);
     ImageTransportFactory::InitializeForUnitTests(
@@ skipping 48 matching lines @@
   scoped_ptr<ReflectorImpl> reflector_;
   scoped_ptr<TestOutputSurface> output_surface_;
 };
 
 namespace {
 TEST_F(ReflectorImplTest, CheckNormalOutputSurface) {
   output_surface_->SetFlip(false);
   SetUpReflector();
   UpdateTexture();
   EXPECT_TRUE(mirroring_layer_->TextureFlipped());
-  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());
+  EXPECT_EQ(SkRegion(SkIRect::MakeXYWH(
+                0, output_surface_->SurfaceSize().height() - kSubRect.height(),
+                kSubRect.width(), kSubRect.height())),
+            mirroring_layer_->damaged_region());
 }
 
 TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) {
   output_surface_->SetFlip(true);
   SetUpReflector();
   UpdateTexture();
   EXPECT_FALSE(mirroring_layer_->TextureFlipped());
-  EXPECT_EQ(kSubRect, mirroring_layer_->damaged_region());
+  EXPECT_EQ(SkRegion(kSkSubRect), mirroring_layer_->damaged_region());
 }
 
 #if defined(USE_OZONE)
 TEST_F(ReflectorImplTest, CheckOverlayNoReflector) {
   cc::OverlayCandidateList list;
   cc::OverlayCandidate plane_1, plane_2;
   plane_1.plane_z_order = 0;
   plane_2.plane_z_order = 1;
   list.push_back(plane_1);
   list.push_back(plane_2);
   output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
   EXPECT_TRUE(list[0].overlay_handled);
 }
 
 TEST_F(ReflectorImplTest, CheckOverlaySWMirroring) {
   SetUpReflector();
   cc::OverlayCandidateList list;
   cc::OverlayCandidate plane_1, plane_2;
   plane_1.plane_z_order = 0;
   plane_2.plane_z_order = 1;
   list.push_back(plane_1);
   list.push_back(plane_2);
   output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
   EXPECT_FALSE(list[0].overlay_handled);
 }
 #endif  // defined(USE_OZONE)
 
 }  // namespace
 }  // namespace content