Improve Aura overdraw by changing hole calculation

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 2815 matching lines @@
 
   View* parent_view = new View;
   content_view->AddChildView(parent_view);
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
 
   View* child_view = new View;
   child_view->SetBounds(50, 50, 100, 100);
   parent_view->AddChildView(child_view);
 
+  widget()->GetCompositor()->Draw(false);
+
   ASSERT_TRUE(child_view->layer() == NULL);
   child_view->SetPaintToLayer(true);
   child_view->SetFillsBoundsOpaquely(true);
+  widget()->GetCompositor()->Draw(false);
   ASSERT_TRUE(child_view->layer());
   EXPECT_EQ(
       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 
   child_view->SetFillsBoundsOpaquely(false);
+  widget()->GetCompositor()->Draw(false);
   EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
 }
 
 // Test that a hole in a layer always corresponds to the bounds of opaque
 // layers.
 TEST_F(ViewLayerTest, MultipleOpaqueLayers) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   View* parent_view = new View;
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
   content_view->AddChildView(parent_view);
 
   View* child_view1 = new View;
   child_view1->SetPaintToLayer(true);
   child_view1->SetFillsBoundsOpaquely(true);
   child_view1->SetBounds(50, 50, 100, 100);
   parent_view->AddChildView(child_view1);
 
   View* child_view2 = new View;
   child_view2->SetPaintToLayer(true);
   child_view2->SetFillsBoundsOpaquely(false);
   child_view2->SetBounds(150, 150, 200, 200);
   parent_view->AddChildView(child_view2);
 
+  widget()->GetCompositor()->Draw(false);
+
   // Only child_view1 is opaque
   EXPECT_EQ(
       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 
   // Both child views are opaque
   child_view2->SetFillsBoundsOpaquely(true);
+  widget()->GetCompositor()->Draw(false);
   EXPECT_TRUE(
       gfx::Rect(50, 50, 100, 100) == parent_view->layer()->hole_rect() ||
       gfx::Rect(150, 150, 200, 200) == parent_view->layer()->hole_rect());
 
   // Only child_view2 is opaque
   delete child_view1;
   EXPECT_EQ(
       gfx::Rect(150, 150, 200, 200), parent_view->layer()->hole_rect());
 }
 
 // Makes sure that opacity of layer persists after toggling visibilty.
 TEST_F(ViewLayerTest, ToggleVisibilityWithOpaqueLayer) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   View* parent_view = new View;
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
   content_view->AddChildView(parent_view);
 
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
 
   View* child_view = new View;
   child_view->SetBounds(50, 50, 100, 100);
   child_view->SetPaintToLayer(true);
   child_view->SetFillsBoundsOpaquely(true);
   parent_view->AddChildView(child_view);
+  widget()->GetCompositor()->Draw(false);
   EXPECT_EQ(
        gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 
   child_view->SetVisible(false);
+  widget()->GetCompositor()->Draw(false);
   EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
 
   child_view->SetVisible(true);
+  widget()->GetCompositor()->Draw(false);
   EXPECT_EQ(
       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 }
 
 // Tests that the layers in the subtree are orphaned after a View is removed
 // from the parent.
 TEST_F(ViewLayerTest, OrphanLayerAfterViewRemove) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
@@ skipping 176 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views