| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 ops.getOutsets(top, right, bottom, left); | 68 ops.getOutsets(top, right, bottom, left); |
| 69 EXPECT_EQ(57, top); | 69 EXPECT_EQ(57, top); |
| 70 EXPECT_EQ(57, right); | 70 EXPECT_EQ(57, right); |
| 71 EXPECT_EQ(57, bottom); | 71 EXPECT_EQ(57, bottom); |
| 72 EXPECT_EQ(57, left); | 72 EXPECT_EQ(57, left); |
| 73 } | 73 } |
| 74 | 74 |
| 75 TEST(WebFilterOperationsTest, getOutsetsDropShadow) | 75 TEST(WebFilterOperationsTest, getOutsetsDropShadow) |
| 76 { | 76 { |
| 77 WebFilterOperations ops; | 77 WebFilterOperations ops; |
| 78 ops.append(WebFilterOperation::createDropShadowFilter(WebPoint(3, 8), 20, 0)
); | 78 ops.append(WebFilterOperation::createDropShadowFilter(3, 8, 20, 0)); |
| 79 int top, right, bottom, left; | 79 int top, right, bottom, left; |
| 80 top = right = bottom = left = 0; | 80 top = right = bottom = left = 0; |
| 81 ops.getOutsets(top, right, bottom, left); | 81 ops.getOutsets(top, right, bottom, left); |
| 82 EXPECT_EQ(49, top); | 82 EXPECT_EQ(49, top); |
| 83 EXPECT_EQ(60, right); | 83 EXPECT_EQ(60, right); |
| 84 EXPECT_EQ(65, bottom); | 84 EXPECT_EQ(65, bottom); |
| 85 EXPECT_EQ(54, left); | 85 EXPECT_EQ(54, left); |
| 86 } | 86 } |
| 87 | 87 |
| 88 #define SAVE_RESTORE_AMOUNT(Type, a) \ | 88 #define SAVE_RESTORE_AMOUNT(Type, a) \ |
| 89 { \ | 89 { \ |
| 90 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a); \ | 90 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a); \ |
| 91 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ | 91 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ |
| 92 EXPECT_EQ(a, op.amount()); \ | 92 EXPECT_EQ(a, op.amount()); \ |
| 93 \ | 93 \ |
| 94 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ | 94 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ |
| 95 op2.setType(WebFilterOperation::FilterType##Type); \ | 95 op2.setType(WebFilterOperation::FilterType##Type); \ |
| 96 \ | 96 \ |
| 97 EXPECT_NE(a, op2.amount()); \ | 97 EXPECT_NE(a, op2.amount()); \ |
| 98 \ | 98 \ |
| 99 op2.setAmount(a); \ | 99 op2.setAmount(a); \ |
| 100 \ | 100 \ |
| 101 EXPECT_EQ(WebFilterOperation::FilterType##Type, op2.type()); \ | 101 EXPECT_EQ(WebFilterOperation::FilterType##Type, op2.type()); \ |
| 102 EXPECT_EQ(a, op2.amount()); \ | 102 EXPECT_EQ(a, op2.amount()); \ |
| 103 } | 103 } |
| 104 | 104 |
| 105 #define SAVE_RESTORE_OFFSET_AMOUNT_COLOR(Type, a, b, c) \ | 105 #define SAVE_RESTORE_OFFSET_AMOUNT_COLOR(Type, a, b, c, d) \ |
| 106 { \ | 106 { \ |
| 107 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a, b, c
); \ | 107 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a, b, c
, d); \ |
| 108 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ | 108 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ |
| 109 EXPECT_EQ(a, op.dropShadowOffset()); \ | 109 EXPECT_EQ(a, op.dropShadowOffsetX()); \ |
| 110 EXPECT_EQ(b, op.amount()); \ | 110 EXPECT_EQ(b, op.dropShadowOffsetY()); \ |
| 111 EXPECT_EQ(c, op.dropShadowColor()); \ | 111 EXPECT_EQ(c, op.amount()); \ |
| 112 EXPECT_EQ(d, op.dropShadowColor()); \ |
| 112 \ | 113 \ |
| 113 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ | 114 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ |
| 114 op2.setType(WebFilterOperation::FilterType##Type); \ | 115 op2.setType(WebFilterOperation::FilterType##Type); \ |
| 115 \ | 116 \ |
| 116 EXPECT_NE(a, op2.dropShadowOffset()); \ | 117 EXPECT_NE(a, op2.dropShadowOffsetX()); \ |
| 117 EXPECT_NE(b, op2.amount()); \ | 118 EXPECT_NE(b, op2.dropShadowOffsetY()); \ |
| 118 EXPECT_NE(c, op2.dropShadowColor()); \ | 119 EXPECT_NE(c, op2.amount()); \ |
| 120 EXPECT_NE(d, op2.dropShadowColor()); \ |
| 119 \ | 121 \ |
| 120 op2.setDropShadowOffset(a); \ | 122 op2.setDropShadowOffset(a, b); \ |
| 121 op2.setAmount(b); \ | 123 op2.setAmount(c); \ |
| 122 op2.setDropShadowColor(c); \ | 124 op2.setDropShadowColor(d); \ |
| 123 \ | 125 \ |
| 124 EXPECT_EQ(WebFilterOperation::FilterType##Type, op2.type()); \ | 126 EXPECT_EQ(WebFilterOperation::FilterType##Type, op2.type()); \ |
| 125 EXPECT_EQ(a, op2.dropShadowOffset()); \ | 127 EXPECT_EQ(a, op2.dropShadowOffsetX()); \ |
| 126 EXPECT_EQ(b, op2.amount()); \ | 128 EXPECT_EQ(b, op2.dropShadowOffsetY()); \ |
| 127 EXPECT_EQ(c, op2.dropShadowColor()); \ | 129 EXPECT_EQ(c, op2.amount()); \ |
| 130 EXPECT_EQ(d, op2.dropShadowColor()); \ |
| 128 } | 131 } |
| 129 | 132 |
| 130 #define SAVE_RESTORE_MATRIX(Type, a) \ | 133 #define SAVE_RESTORE_MATRIX(Type, a) \ |
| 131 { \ | 134 { \ |
| 132 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a); \ | 135 WebFilterOperation op = WebFilterOperation::create##Type##Filter(a); \ |
| 133 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ | 136 EXPECT_EQ(WebFilterOperation::FilterType##Type, op.type()); \ |
| 134 for (unsigned i = 0; i < 20; ++i) \ | 137 for (unsigned i = 0; i < 20; ++i) \ |
| 135 EXPECT_EQ(a[i], op.matrix()[i]); \ | 138 EXPECT_EQ(a[i], op.matrix()[i]); \ |
| 136 \ | 139 \ |
| 137 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ | 140 WebFilterOperation op2 = WebFilterOperation::createEmptyFilter(); \ |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 { | 176 { |
| 174 SAVE_RESTORE_AMOUNT(Grayscale, 0.6f); | 177 SAVE_RESTORE_AMOUNT(Grayscale, 0.6f); |
| 175 SAVE_RESTORE_AMOUNT(Sepia, 0.6f); | 178 SAVE_RESTORE_AMOUNT(Sepia, 0.6f); |
| 176 SAVE_RESTORE_AMOUNT(Saturate, 0.6f); | 179 SAVE_RESTORE_AMOUNT(Saturate, 0.6f); |
| 177 SAVE_RESTORE_AMOUNT(HueRotate, 0.6f); | 180 SAVE_RESTORE_AMOUNT(HueRotate, 0.6f); |
| 178 SAVE_RESTORE_AMOUNT(Invert, 0.6f); | 181 SAVE_RESTORE_AMOUNT(Invert, 0.6f); |
| 179 SAVE_RESTORE_AMOUNT(Brightness, 0.6f); | 182 SAVE_RESTORE_AMOUNT(Brightness, 0.6f); |
| 180 SAVE_RESTORE_AMOUNT(Contrast, 0.6f); | 183 SAVE_RESTORE_AMOUNT(Contrast, 0.6f); |
| 181 SAVE_RESTORE_AMOUNT(Opacity, 0.6f); | 184 SAVE_RESTORE_AMOUNT(Opacity, 0.6f); |
| 182 SAVE_RESTORE_AMOUNT(Blur, 0.6f); | 185 SAVE_RESTORE_AMOUNT(Blur, 0.6f); |
| 183 SAVE_RESTORE_OFFSET_AMOUNT_COLOR(DropShadow, WebPoint(3, 4), 0.4f, 0xffffff0
0); | 186 SAVE_RESTORE_OFFSET_AMOUNT_COLOR(DropShadow, 3, 4, 0.4f, 0xffffff00); |
| 184 | 187 |
| 185 SkScalar matrix[20] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1
6, 17, 18, 19, 20 }; | 188 SkScalar matrix[20] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1
6, 17, 18, 19, 20 }; |
| 186 SAVE_RESTORE_MATRIX(ColorMatrix, matrix); | 189 SAVE_RESTORE_MATRIX(ColorMatrix, matrix); |
| 187 | 190 |
| 188 SAVE_RESTORE_AMOUNT_INSET(Zoom, 0.5f, 32); | 191 SAVE_RESTORE_AMOUNT_INSET(Zoom, 0.5f, 32); |
| 189 } | 192 } |
| 190 | 193 |
| 191 } | 194 } |
| 192 | 195 |
| OLD | NEW |