Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: cc/test/geometry_test_utils.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/geometry_test_utils.h" 5 #include "cc/test/geometry_test_utils.h"
6 6
7 #include <public/WebTransformationMatrix.h>
8
7 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
8 #include <public/WebTransformationMatrix.h> 10 #include "ui/gfx/transform.h"
9 11
10 namespace WebKitTests { 12 namespace WebKitTests {
11 13
12 void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte d, 14 void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte d,
13 const WebKit::WebTransformationMatrix& actual) 15 const WebKit::WebTransformationMatrix& actual)
14 { 16 {
15 EXPECT_FLOAT_EQ((expected).m11(), (actual).m11()); 17 EXPECT_FLOAT_EQ((expected).m11(), (actual).m11());
16 EXPECT_FLOAT_EQ((expected).m12(), (actual).m12()); 18 EXPECT_FLOAT_EQ((expected).m12(), (actual).m12());
17 EXPECT_FLOAT_EQ((expected).m13(), (actual).m13()); 19 EXPECT_FLOAT_EQ((expected).m13(), (actual).m13());
18 EXPECT_FLOAT_EQ((expected).m14(), (actual).m14()); 20 EXPECT_FLOAT_EQ((expected).m14(), (actual).m14());
19 EXPECT_FLOAT_EQ((expected).m21(), (actual).m21()); 21 EXPECT_FLOAT_EQ((expected).m21(), (actual).m21());
20 EXPECT_FLOAT_EQ((expected).m22(), (actual).m22()); 22 EXPECT_FLOAT_EQ((expected).m22(), (actual).m22());
21 EXPECT_FLOAT_EQ((expected).m23(), (actual).m23()); 23 EXPECT_FLOAT_EQ((expected).m23(), (actual).m23());
22 EXPECT_FLOAT_EQ((expected).m24(), (actual).m24()); 24 EXPECT_FLOAT_EQ((expected).m24(), (actual).m24());
23 EXPECT_FLOAT_EQ((expected).m31(), (actual).m31()); 25 EXPECT_FLOAT_EQ((expected).m31(), (actual).m31());
24 EXPECT_FLOAT_EQ((expected).m32(), (actual).m32()); 26 EXPECT_FLOAT_EQ((expected).m32(), (actual).m32());
25 EXPECT_FLOAT_EQ((expected).m33(), (actual).m33()); 27 EXPECT_FLOAT_EQ((expected).m33(), (actual).m33());
26 EXPECT_FLOAT_EQ((expected).m34(), (actual).m34()); 28 EXPECT_FLOAT_EQ((expected).m34(), (actual).m34());
27 EXPECT_FLOAT_EQ((expected).m41(), (actual).m41()); 29 EXPECT_FLOAT_EQ((expected).m41(), (actual).m41());
28 EXPECT_FLOAT_EQ((expected).m42(), (actual).m42()); 30 EXPECT_FLOAT_EQ((expected).m42(), (actual).m42());
29 EXPECT_FLOAT_EQ((expected).m43(), (actual).m43()); 31 EXPECT_FLOAT_EQ((expected).m43(), (actual).m43());
30 EXPECT_FLOAT_EQ((expected).m44(), (actual).m44()); 32 EXPECT_FLOAT_EQ((expected).m44(), (actual).m44());
31 } 33 }
32 34
35 void ExpectTransformationMatrixEq(const gfx::Transform& expected,
36 const gfx::Transform& actual)
37 {
38 EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 0), (actual).matrix().getDo uble(0, 0));
danakj 2012/11/24 02:34:54 Use EXPECT_DOUBLE_EQ
shawnsingh 2012/11/24 02:56:14 I'll give it a try, but we might not be able to do
danakj 2012/11/24 03:20:09 I see. If it's a problem, keeping it as it has bee
39 EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 0), (actual).matrix().getDo uble(1, 0));
40 EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 0), (actual).matrix().getDo uble(2, 0));
41 EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 0), (actual).matrix().getDo uble(3, 0));
42 EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 1), (actual).matrix().getDo uble(0, 1));
43 EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 1), (actual).matrix().getDo uble(1, 1));
44 EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 1), (actual).matrix().getDo uble(2, 1));
45 EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 1), (actual).matrix().getDo uble(3, 1));
46 EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 2), (actual).matrix().getDo uble(0, 2));
47 EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 2), (actual).matrix().getDo uble(1, 2));
48 EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 2), (actual).matrix().getDo uble(2, 2));
49 EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 2), (actual).matrix().getDo uble(3, 2));
50 EXPECT_FLOAT_EQ((expected).matrix().getDouble(0, 3), (actual).matrix().getDo uble(0, 3));
51 EXPECT_FLOAT_EQ((expected).matrix().getDouble(1, 3), (actual).matrix().getDo uble(1, 3));
52 EXPECT_FLOAT_EQ((expected).matrix().getDouble(2, 3), (actual).matrix().getDo uble(2, 3));
53 EXPECT_FLOAT_EQ((expected).matrix().getDouble(3, 3), (actual).matrix().getDo uble(3, 3));
54 }
55
33 } // namespace WebKitTests 56 } // namespace WebKitTests
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698