Index: Source/WebKit/chromium/tests/FilterOperationsTest.cpp |
diff --git a/Source/WebKit/chromium/tests/FilterOperationsTest.cpp b/Source/WebKit/chromium/tests/FilterOperationsTest.cpp |
index a85dfa29817648bf4c2972682c8c727e67795fae..0997944375f872c808a8cfffd3e2e5b43f3f281f 100644 |
--- a/Source/WebKit/chromium/tests/FilterOperationsTest.cpp |
+++ b/Source/WebKit/chromium/tests/FilterOperationsTest.cpp |
@@ -75,7 +75,7 @@ TEST(WebFilterOperationsTest, getOutsetsBlur) |
TEST(WebFilterOperationsTest, getOutsetsDropShadow) |
{ |
WebFilterOperations ops; |
- ops.append(WebFilterOperation::createDropShadowFilter(WebPoint(3, 8), 20, 0)); |
+ ops.append(WebFilterOperation::createDropShadowFilter(3, 8, 20, 0)); |
int top, right, bottom, left; |
top = right = bottom = left = 0; |
ops.getOutsets(top, right, bottom, left); |
@@ -102,29 +102,32 @@ TEST(WebFilterOperationsTest, getOutsetsDropShadow) |
EXPECT_EQ(a, op2.amount()); \ |
} |
-#define SAVE_RESTORE_OFFSET_AMOUNT_COLOR(Type, a, b, c) \ |
+#define SAVE_RESTORE_OFFSET_AMOUNT_COLOR(Type, a, b, c, d) \ |
{ \ |
- WebFilterOperation op = WebFilterOperation::create##Type##Filter(a, b, c); \ |
+ WebFilterOperation op = WebFilterOperation::create##Type##Filter(a, b, c, d); \ |
EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ |
- EXPECT_EQ(a, op.dropShadowOffset()); \ |
- EXPECT_EQ(b, op.amount()); \ |
- EXPECT_EQ(c, op.dropShadowColor()); \ |
+ EXPECT_EQ(a, op.dropShadowOffsetX()); \ |
+ EXPECT_EQ(b, op.dropShadowOffsetY()); \ |
+ EXPECT_EQ(c, op.amount()); \ |
+ EXPECT_EQ(d, op.dropShadowColor()); \ |
\ |
WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ |
op2.setType(WebFilterOperation::FilterType##Type); \ |
\ |
- EXPECT_NE(a, op2.dropShadowOffset()); \ |
- EXPECT_NE(b, op2.amount()); \ |
- EXPECT_NE(c, op2.dropShadowColor()); \ |
+ EXPECT_NE(a, op2.dropShadowOffsetX()); \ |
+ EXPECT_NE(b, op2.dropShadowOffsetY()); \ |
+ EXPECT_NE(c, op2.amount()); \ |
+ EXPECT_NE(d, op2.dropShadowColor()); \ |
\ |
- op2.setDropShadowOffset(a); \ |
- op2.setAmount(b); \ |
- op2.setDropShadowColor(c); \ |
+ op2.setDropShadowOffset(a, b); \ |
+ op2.setAmount(c); \ |
+ op2.setDropShadowColor(d); \ |
\ |
EXPECT_EQ(WebFilterOperation::FilterType##Type, op2.type()); \ |
- EXPECT_EQ(a, op2.dropShadowOffset()); \ |
- EXPECT_EQ(b, op2.amount()); \ |
- EXPECT_EQ(c, op2.dropShadowColor()); \ |
+ EXPECT_EQ(a, op2.dropShadowOffsetX()); \ |
+ EXPECT_EQ(b, op2.dropShadowOffsetY()); \ |
+ EXPECT_EQ(c, op2.amount()); \ |
+ EXPECT_EQ(d, op2.dropShadowColor()); \ |
} |
#define SAVE_RESTORE_MATRIX(Type, a) \ |
@@ -180,7 +183,7 @@ TEST(WebFilterOperationsTest, saveAndRestore) |
SAVE_RESTORE_AMOUNT(Contrast, 0.6f); |
SAVE_RESTORE_AMOUNT(Opacity, 0.6f); |
SAVE_RESTORE_AMOUNT(Blur, 0.6f); |
- SAVE_RESTORE_OFFSET_AMOUNT_COLOR(DropShadow, WebPoint(3, 4), 0.4f, 0xffffff00); |
+ SAVE_RESTORE_OFFSET_AMOUNT_COLOR(DropShadow, 3, 4, 0.4f, 0xffffff00); |
SkScalar matrix[20] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 }; |
SAVE_RESTORE_MATRIX(ColorMatrix, matrix); |