ui: Prefer +/- operators to apply offsets.

ui/gfx/vector3d_unittest.cc

 // Copyright (c) 2012 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/vector3d_f.h"
 
 #include <cmath>
 #include <limits>
@@ skipping 70 matching lines @@
 
     { 0, 1.2f, 0, 3.3f, 5.6f, 4.2f },
     { 0, 1.2f, 1.8f, 3.3f, 5.6f, 4.2f }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(triple_values); ++i) {
     gfx::Vector3dF v(triple_values[i][0],
                      triple_values[i][1],
                      triple_values[i][2]);
     v.Scale(triple_values[i][3], triple_values[i][4], triple_values[i][5]);
-    EXPECT_EQ(v.x(), triple_values[i][0] * triple_values[i][3]);
-    EXPECT_EQ(v.y(), triple_values[i][1] * triple_values[i][4]);
-    EXPECT_EQ(v.z(), triple_values[i][2] * triple_values[i][5]);
+    EXPECT_EQ(triple_values[i][0] * triple_values[i][3], v.x());
+    EXPECT_EQ(triple_values[i][1] * triple_values[i][4], v.y());
+    EXPECT_EQ(triple_values[i][2] * triple_values[i][5], v.z());
+
+    Vector3dF v2 = ScaleVector3d(
+        gfx::Vector3dF(triple_values[i][0],
+                       triple_values[i][1],
+                       triple_values[i][2]),
+        triple_values[i][3], triple_values[i][4], triple_values[i][5]);
+    EXPECT_EQ(triple_values[i][0] * triple_values[i][3], v2.x());
+    EXPECT_EQ(triple_values[i][1] * triple_values[i][4], v2.y());
+    EXPECT_EQ(triple_values[i][2] * triple_values[i][5], v2.z());
   }
 
   float single_values[][4] = {
     { 4.5f, 1.2f, 1.8f, 3.3f },
     { 4.5f, -1.2f, 1.8f, 3.3f },
     { 4.5f, 1.2f, -1.8f, 3.3f },
     { 4.5f, -1.2f, -1.8f, 3.3f },
     { -4.5f, 1.2f, 3.3f },
     { -4.5f, 1.2f, 0 },
     { -4.5f, 1.2f, 1.8f, 3.3f },
     { -4.5f, 1.2f, 1.8f, 0 },
     { 4.5f, 0, 1.8f, 3.3f },
     { 0, 1.2f, 1.8f, 3.3f },
     { 4.5f, 0, 1.8f, 3.3f },
     { 0, 1.2f, 1.8f, 3.3f },
     { 4.5f, 1.2f, 0, 3.3f },
     { 4.5f, 1.2f, 0, 3.3f }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(single_values); ++i) {
     gfx::Vector3dF v(single_values[i][0],
                      single_values[i][1],
                      single_values[i][2]);
     v.Scale(single_values[i][3]);
-    EXPECT_EQ(v.x(), single_values[i][0] * single_values[i][3]);
-    EXPECT_EQ(v.y(), single_values[i][1] * single_values[i][3]);
-    EXPECT_EQ(v.z(), single_values[i][2] * single_values[i][3]);
+    EXPECT_EQ(single_values[i][0] * single_values[i][3], v.x());
+    EXPECT_EQ(single_values[i][1] * single_values[i][3], v.y());
+    EXPECT_EQ(single_values[i][2] * single_values[i][3], v.z());
+
+    Vector3dF v2 = ScaleVector3d(
+        gfx::Vector3dF(single_values[i][0],
+                       single_values[i][1],
+                       single_values[i][2]),
+        single_values[i][3]);
+    EXPECT_EQ(single_values[i][0] * single_values[i][3], v2.x());
+    EXPECT_EQ(single_values[i][1] * single_values[i][3], v2.y());
+    EXPECT_EQ(single_values[i][2] * single_values[i][3], v2.z());
   }
 }
 
 TEST(Vector3dTest, Length) {
   float float_values[][3] = {
     { 0, 0, 0 },
     { 10.5f, 20.5f, 8.5f },
     { 20.5f, 10.5f, 8.5f },
     { 8.5f, 20.5f, 10.5f },
     { 10.5f, 8.5f, 20.5f },
@@ skipping 75 matching lines @@
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     Vector3dF actual = gfx::CrossProduct(tests[i].input1, tests[i].input2);
     EXPECT_EQ(tests[i].expected.ToString(), actual.ToString());
   }
 
 }
 
 }  // namespace gfx