ui: Prefer +/- operators to apply offsets.

ui/gfx/rect_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 "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
@@ skipping 653 matching lines @@
       RectF(-4.2f, -4.2f, 11.0f, 11.0f) }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(float_tests); ++i) {
     RectF actual = BoundingRect(float_tests[i].a, float_tests[i].b);
     EXPECT_EQ(float_tests[i].expected.ToString(), actual.ToString());
   }
 }
 
 TEST(RectTest, IsExpressibleAsRect) {
   EXPECT_TRUE(gfx::RectF().IsExpressibleAsRect());

[tfarina, 2012/11/09 14:29:52]

nit: I though I had removed the gfx:: prefix when inside gfx namespace, can you
fix this while you are here?

[danakj, 2012/11/09 16:15:11]

Done.

 
   float min = std::numeric_limits<int>::min();
   float max = std::numeric_limits<int>::max();
   float infinity = std::numeric_limits<float>::infinity();
 
   EXPECT_TRUE(gfx::RectF(
       min + 200, min + 200, max - 200, max - 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(
       min - 200, min + 200, max + 200, max + 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(
       min + 200 , min - 200, max + 200, max + 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(
       min + 200, min + 200, max + 200, max - 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(
       min + 200, min + 200, max - 200, max + 200).IsExpressibleAsRect());
 
   EXPECT_TRUE(gfx::RectF(0, 0, max - 200, max - 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(200, 0, max + 200, max - 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, 200, max - 200, max + 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, 0, max + 200, max - 200).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, 0, max - 200, max + 200).IsExpressibleAsRect());
 
   EXPECT_FALSE(gfx::RectF(infinity, 0, 1, 1).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, infinity, 1, 1).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, 0, infinity, 1).IsExpressibleAsRect());
   EXPECT_FALSE(gfx::RectF(0, 0, 1, infinity).IsExpressibleAsRect());
 }
 
+TEST(RectTest, Offset) {
+  Rect i(1, 2, 3, 4);
+
+  EXPECT_EQ(Rect(2, 1, 3, 4).ToString(), (i + Vector2d(1, -1)).ToString());
+  i += Vector2d(1, -1);
+  EXPECT_EQ(Rect(2, 1, 3, 4).ToString(), i.ToString());
+  EXPECT_EQ(Rect(1, 2, 3, 4).ToString(), (i - Vector2d(1, -1)).ToString());
+  i -= Vector2d(1, -1);
+  EXPECT_EQ(Rect(1, 2, 3, 4).ToString(), i.ToString());
+
+  RectF f(1.1f, 2.2f, 3.3f, 4.4f);
+  EXPECT_EQ(RectF(2.2f, 1.1f, 3.3f, 4.4f).ToString(),
+            (f + Vector2dF(1.1f, -1.1f)).ToString());
+  f += Vector2dF(1.1f, -1.1f);
+  EXPECT_EQ(RectF(2.2f, 1.1f, 3.3f, 4.4f).ToString(), f.ToString());
+  EXPECT_EQ(RectF(1.1f, 2.2f, 3.3f, 4.4f).ToString(),
+            (f - Vector2dF(1.1f, -1.1f)).ToString());
+  f -= Vector2dF(1.1f, -1.1f);
+  EXPECT_EQ(RectF(1.1f, 2.2f, 3.3f, 4.4f).ToString(), f.ToString());
+}
+
 }  // namespace gfx