| Index: ui/gfx/vector3d_unittest.cc
|
| diff --git a/ui/gfx/vector3d_unittest.cc b/ui/gfx/vector3d_unittest.cc
|
| index cfac51eab0d0ac3e600b54603bfa85c7e7110754..9597e39d478a81cd1e778f7ed9df7087a85227c7 100644
|
| --- a/ui/gfx/vector3d_unittest.cc
|
| +++ b/ui/gfx/vector3d_unittest.cc
|
| @@ -88,9 +88,18 @@ TEST(Vector3dTest, Scale) {
|
| 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] = {
|
| @@ -115,9 +124,18 @@ TEST(Vector3dTest, Scale) {
|
| 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());
|
| }
|
| }
|
|
|
|
|