Make gfx::Rect class operations consistently mutate the class they are called on.

Currently some methods mutate the class, and some return a new value, requiring
API users to know what kind of method they are calling each time, and making
inconsistent code. For example:

gfx::Rect rect;
rect.Inset(1, 1, 1, 1);
rect = rect.Intersect(other_rect);
rect.Offset(1, 1);

Instead of:

gfx::Rect rect;
rect.Inset(1, 1, 1, 1);
rect.Intersect(other_rect);
rect.Offset(1, 1);

We could go either way - making the class immutable or all methods return a new
instance - but I believe it is better to instead make all methods mutate the
class. This allows for shorter lines of code by avoiding having to repeat the
object's name twice in order to change it.

This patch changes gfx::Rect classes and all the callsites that uses these
methods. It should make no change in behaviour, so no new tests added.

R=sky
BUG=147395

Review URL: https://codereview.chromium.org/11110004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163579 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/content/renderer/paint_aggregator_unittest.cc b/content/renderer/paint_aggregator_unittest.cc
index a651f9e..7261822 100644
--- a/content/renderer/paint_aggregator_unittest.cc
+++ b/content/renderer/paint_aggregator_unittest.cc
@@ -37,7 +37,8 @@ TEST(PaintAggregator, DoubleDisjointInvalidation) {
   greg.InvalidateRect(r1);
   greg.InvalidateRect(r2);
 
-  gfx::Rect expected_bounds = r1.Union(r2);
+  gfx::Rect expected_bounds = r1;
+  expected_bounds.Union(r2);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   PaintAggregator::PendingUpdate update;
@@ -61,7 +62,8 @@ TEST(PaintAggregator, DisjointInvalidationsCombined) {
   greg.InvalidateRect(r1);
   greg.InvalidateRect(r2);
 
-  gfx::Rect expected_bounds = r1.Union(r2);
+  gfx::Rect expected_bounds = r1;
+  expected_bounds.Union(r2);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   PaintAggregator::PendingUpdate update;
@@ -277,7 +279,8 @@ TEST(PaintAggregator, OverlappingPaintBeforeScroll) {
   gfx::Rect scroll_rect(0, 0, 10, 10);
   greg.ScrollRect(2, 0, scroll_rect);
 
-  gfx::Rect expected_paint_rect = scroll_rect.Union(paint_rect);
+  gfx::Rect expected_paint_rect = scroll_rect;
+  expected_paint_rect.Union(paint_rect);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   PaintAggregator::PendingUpdate update;
@@ -298,7 +301,8 @@ TEST(PaintAggregator, OverlappingPaintAfterScroll) {
   gfx::Rect paint_rect(4, 4, 10, 2);
   greg.InvalidateRect(paint_rect);
 
-  gfx::Rect expected_paint_rect = scroll_rect.Union(paint_rect);
+  gfx::Rect expected_paint_rect = scroll_rect;
+  expected_paint_rect.Union(paint_rect);
 
   EXPECT_TRUE(greg.HasPendingUpdate());
   PaintAggregator::PendingUpdate update;