Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef UI_GFX_TEST_GFX_UTIL_H_ | 5 #ifndef UI_GFX_TEST_GFX_UTIL_H_ |
| 6 #define UI_GFX_TEST_GFX_UTIL_H_ | 6 #define UI_GFX_TEST_GFX_UTIL_H_ |
| 7 | 7 |
| 8 #include <iosfwd> | 8 #include <iosfwd> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include "third_party/skia/include/core/SkColor.h" | 12 #include "third_party/skia/include/core/SkColor.h" |
| 13 #include "ui/gfx/box_f.h" | 13 #include "ui/gfx/box_f.h" |
| 14 | 14 #include "ui/gfx/geometry/rect.h" |
|
danakj
2014/07/07 18:52:27
do you mean rect_f.h?
jamesr
2014/07/07 19:37:25
Whoops, yes. Will fix
| |
| 15 | 15 |
| 16 namespace gfx { | 16 namespace gfx { |
| 17 | 17 |
| 18 // Checks that the box coordinates are each almost equal floats. | 18 // Checks that the box coordinates are each almost equal floats. |
| 19 #define EXPECT_BOXF_EQ(a, b) \ | 19 #define EXPECT_BOXF_EQ(a, b) \ |
| 20 EXPECT_PRED_FORMAT2(::gfx::AssertBoxFloatEqual, a, b) | 20 EXPECT_PRED_FORMAT2(::gfx::AssertBoxFloatEqual, a, b) |
| 21 | 21 |
| 22 ::testing::AssertionResult AssertBoxFloatEqual(const char* lhs_expr, | 22 ::testing::AssertionResult AssertBoxFloatEqual(const char* lhs_expr, |
| 23 const char* rhs_expr, | 23 const char* rhs_expr, |
| 24 const BoxF& lhs, | 24 const BoxF& lhs, |
| 25 const BoxF& rhs); | 25 const BoxF& rhs); |
| 26 | 26 |
| 27 #define EXPECT_RECTF_EQ(a, b) \ | |
| 28 EXPECT_PRED_FORMAT2(::gfx::AssertRectFloatEqual, a, b) | |
| 29 | |
| 30 ::testing::AssertionResult AssertRectFloatEqual(const char* lhs_expr, | |
|
danakj
2014/07/07 18:52:27
Is this related to this CL somehow or here by mist
jamesr
2014/07/07 19:37:25
It's related - code that was doing comparisons bet
| |
| 31 const char* rhs_expr, | |
| 32 const RectF& lhs, | |
| 33 const RectF& rhs); | |
| 34 | |
| 27 #define EXPECT_SKCOLOR_EQ(a, b) \ | 35 #define EXPECT_SKCOLOR_EQ(a, b) \ |
| 28 EXPECT_PRED_FORMAT2(::gfx::AssertSkColorsEqual, a, b) | 36 EXPECT_PRED_FORMAT2(::gfx::AssertSkColorsEqual, a, b) |
| 29 | 37 |
| 30 ::testing::AssertionResult AssertSkColorsEqual(const char* lhs_expr, | 38 ::testing::AssertionResult AssertSkColorsEqual(const char* lhs_expr, |
| 31 const char* rhs_expr, | 39 const char* rhs_expr, |
| 32 SkColor lhs, | 40 SkColor lhs, |
| 33 SkColor rhs); | 41 SkColor rhs); |
| 34 | 42 |
| 35 } // namespace gfx | 43 } // namespace gfx |
| 36 | 44 |
| 37 #endif // UI_GFX_TEST_GFX_UTIL_H_ | 45 #endif // UI_GFX_TEST_GFX_UTIL_H_ |
| OLD | NEW |