ui: Add non-member Vector2dScale() and Vector3dScale() methods to create scaled vectors

ui/gfx/vector2d_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/vector2d.h"
 #include "ui/gfx/vector2d_f.h"
 
 #include <cmath>
@@ skipping 97 matching lines @@
     { -4.5f, 1.2f, 3.3f, 0 },
     { 4.5f, 0, 3.3f, 5.6f },
     { 0, 1.2f, 3.3f, 5.6f }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(double_values); ++i) {
     Vector2dF v(double_values[i][0], double_values[i][1]);
     v.Scale(double_values[i][2], double_values[i][3]);
     EXPECT_EQ(v.x(), double_values[i][0] * double_values[i][2]);
     EXPECT_EQ(v.y(), double_values[i][1] * double_values[i][3]);
+
+    Vector2dF v2 = ScaleVector2d(
+        gfx::Vector2dF(double_values[i][0], double_values[i][1]),
+        double_values[i][2], double_values[i][3]);
+    EXPECT_EQ(v2.x(), double_values[i][0] * double_values[i][2]);

[sky, 2012/11/09 17:06:21]

Your The order is wrong here. You want expected,actual.

[danakj, 2012/11/09 18:21:47]

Oops, thanks.

+    EXPECT_EQ(v2.y(), double_values[i][1] * double_values[i][3]);
   }
 
   float single_values[][3] = {
     { 4.5f, 1.2f, 3.3f },
     { 4.5f, -1.2f, 3.3f },
     { 4.5f, 1.2f, 3.3f },
     { 4.5f, 1.2f, -3.3f },
     { -4.5f, 1.2f, 3.3f },
     { -4.5f, 1.2f, 0 },
     { -4.5f, 1.2f, 3.3f },
     { 4.5f, 0, 3.3f },
     { 0, 1.2f, 3.3f }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(single_values); ++i) {
     Vector2dF v(single_values[i][0], single_values[i][1]);
     v.Scale(single_values[i][2]);
     EXPECT_EQ(v.x(), single_values[i][0] * single_values[i][2]);
     EXPECT_EQ(v.y(), single_values[i][1] * single_values[i][2]);
+
+    Vector2dF v2 = ScaleVector2d(
+        gfx::Vector2dF(double_values[i][0], double_values[i][1]),
+        double_values[i][2]);
+    EXPECT_EQ(v2.x(), single_values[i][0] * single_values[i][2]);
+    EXPECT_EQ(v2.y(), single_values[i][1] * single_values[i][2]);
   }
 }
 
 TEST(Vector2dTest, Length) {
   int int_values[][2] = {
     { 0, 0 },
     { 10, 20 },
     { 20, 10 },
     { -10, -20 },
     { -20, 10 },
@@ skipping 30 matching lines @@
     double length_squared =
         static_cast<double>(v0) * v0 + static_cast<double>(v1) * v1;
     double length = std::sqrt(length_squared);
     Vector2dF vector(v0, v1);
     EXPECT_EQ(length_squared, vector.LengthSquared());
     EXPECT_EQ(static_cast<float>(length), vector.Length());
   }
 }
 
 }  // namespace gfx