Allow painting multiple paint rects....

chrome/renderer/paint_aggregator_unittest.cc

 // Copyright (c) 2009 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 "chrome/renderer/paint_aggregator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(PaintAggregator, InitialState) {
   PaintAggregator greg;
   EXPECT_FALSE(greg.HasPendingUpdate());
 }
 
 TEST(PaintAggregator, SingleInvalidation) {
   PaintAggregator greg;
 
   gfx::Rect rect(2, 4, 10, 16);
   greg.InvalidateRect(rect);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   EXPECT_TRUE(greg.GetPendingUpdate().scroll_rect.IsEmpty());
   ASSERT_EQ(1U, greg.GetPendingUpdate().paint_rects.size());
 
   EXPECT_EQ(rect, greg.GetPendingUpdate().paint_rects[0]);
 }
 
 TEST(PaintAggregator, DoubleDisjointInvalidation) {
   PaintAggregator greg;
 
-  gfx::Rect r1(2, 4, 2, 4);
-  gfx::Rect r2(4, 2, 4, 2);
+  gfx::Rect r1(2, 4, 2, 40);
+  gfx::Rect r2(4, 2, 40, 2);
 
   greg.InvalidateRect(r1);
   greg.InvalidateRect(r2);
 
   gfx::Rect expected_bounds = r1.Union(r2);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   EXPECT_TRUE(greg.GetPendingUpdate().scroll_rect.IsEmpty());
-  ASSERT_EQ(2U, greg.GetPendingUpdate().paint_rects.size());
+  EXPECT_EQ(2U, greg.GetPendingUpdate().paint_rects.size());
 
   EXPECT_EQ(expected_bounds, greg.GetPendingUpdate().GetPaintBounds());
 }
 
+TEST(PaintAggregator, DisjointInvalidationsCombined) {
+  PaintAggregator greg;
+
+  gfx::Rect r1(2, 4, 2, 2);
+  gfx::Rect r2(4, 2, 2, 2);
+
+  greg.InvalidateRect(r1);
+  greg.InvalidateRect(r2);
+
+  gfx::Rect expected_bounds = r1.Union(r2);
+
+  EXPECT_TRUE(greg.HasPendingUpdate());
+  EXPECT_TRUE(greg.GetPendingUpdate().scroll_rect.IsEmpty());
+  ASSERT_EQ(1U, greg.GetPendingUpdate().paint_rects.size());
+
+  EXPECT_EQ(expected_bounds, greg.GetPendingUpdate().paint_rects[0]);
+}
+
 TEST(PaintAggregator, SingleScroll) {
   PaintAggregator greg;
 
   gfx::Rect rect(1, 2, 3, 4);
   gfx::Point delta(1, 0);
   greg.ScrollRect(delta.x(), delta.y(), rect);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   EXPECT_TRUE(greg.GetPendingUpdate().paint_rects.empty());
   EXPECT_FALSE(greg.GetPendingUpdate().scroll_rect.IsEmpty());
@@ skipping 309 matching lines @@
   gfx::Rect expected_scroll_damage(0, 0, 4, 10);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
 
   EXPECT_FALSE(greg.GetPendingUpdate().scroll_rect.IsEmpty());
   EXPECT_TRUE(greg.GetPendingUpdate().paint_rects.empty());
 
   EXPECT_EQ(scroll_rect, greg.GetPendingUpdate().scroll_rect);
   EXPECT_EQ(expected_scroll_damage, greg.GetPendingUpdate().GetScrollDamage());
 }