Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3

am: 007c463e64

Change-Id: Idb404e8f99289a1492d7d3f1af938cf5c0f1c7f0
This commit is contained in:
Chih-Hung Hsieh
2016-08-27 00:08:36 +00:00
committed by android-build-merger

View File

@@ -48,10 +48,10 @@ typedef DisplayListCanvas TestCanvas;
EXPECT_TRUE(TestUtils::matricesAreApproxEqual(a, b))
#define EXPECT_RECT_APPROX_EQ(a, b) \
EXPECT_TRUE(MathUtils::areEqual(a.left, b.left) \
&& MathUtils::areEqual(a.top, b.top) \
&& MathUtils::areEqual(a.right, b.right) \
&& MathUtils::areEqual(a.bottom, b.bottom));
EXPECT_TRUE(MathUtils::areEqual((a).left, (b).left) \
&& MathUtils::areEqual((a).top, (b).top) \
&& MathUtils::areEqual((a).right, (b).right) \
&& MathUtils::areEqual((a).bottom, (b).bottom));
#define EXPECT_CLIP_RECT(expRect, clipStatePtr) \
EXPECT_NE(nullptr, (clipStatePtr)) << "Op is unclipped"; \