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 |
11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
13 * | 13 * |
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "public/platform/WebFilterOperation.h" | 27 #include "public/common/WebFilterOperation.h" |
28 | |
29 #include <string.h> | |
30 | 28 |
31 namespace WebKit { | 29 namespace WebKit { |
32 | 30 |
33 bool WebFilterOperation::equals(const WebFilterOperation& other) const | 31 bool WebFilterOperation::equals(const WebFilterOperation& other) const |
34 { | 32 { |
35 if (m_type != other.m_type) | 33 if (m_type != other.m_type) |
36 return false; | 34 return false; |
37 if (m_type == FilterTypeColorMatrix) | 35 if (m_type == FilterTypeColorMatrix) |
38 return !memcmp(m_matrix, other.m_matrix, sizeof(m_matrix)); | 36 return !memcmp(m_matrix, other.m_matrix, sizeof(m_matrix)); |
39 if (m_type == FilterTypeDropShadow) { | 37 if (m_type == FilterTypeDropShadow) { |
40 return m_amount == other.m_amount | 38 return m_amount == other.m_amount |
41 && m_dropShadowOffset == other.m_dropShadowOffset | 39 && m_dropShadowOffsetX == other.m_dropShadowOffsetX |
| 40 && m_dropShadowOffsetY == other.m_dropShadowOffsetY |
42 && m_dropShadowColor == other.m_dropShadowColor; | 41 && m_dropShadowColor == other.m_dropShadowColor; |
43 } else | 42 } else { |
44 return m_amount == other.m_amount; | 43 return m_amount == other.m_amount; |
| 44 } |
45 } | 45 } |
46 | 46 |
47 WebFilterOperation::WebFilterOperation(FilterType type, SkScalar matrix[20]) | 47 WebFilterOperation::WebFilterOperation(FilterType type, SkScalar matrix[20]) |
48 : m_type(type) | 48 : m_type(type) |
49 , m_amount(0) | 49 , m_amount(0) |
50 , m_dropShadowOffset(0, 0) | 50 , m_dropShadowOffsetX(0) |
| 51 , m_dropShadowOffsetY(0) |
51 , m_dropShadowColor(0) | 52 , m_dropShadowColor(0) |
52 , m_zoomInset(0) | 53 , m_zoomInset(0) |
53 { | 54 { |
54 WEBKIT_ASSERT(m_type == FilterTypeColorMatrix); | 55 WEBKIT_ASSERT(m_type == FilterTypeColorMatrix); |
55 memcpy(m_matrix, matrix, sizeof(m_matrix)); | 56 memcpy(m_matrix, matrix, sizeof(m_matrix)); |
56 } | 57 } |
57 | 58 |
58 } // namespace WebKit | 59 } // namespace WebKit |
OLD | NEW |