Index: Source/common/WebFilterOperation.cpp |
diff --git a/Source/core/platform/chromium/support/WebFilterOperation.cpp b/Source/common/WebFilterOperation.cpp |
similarity index 89% |
rename from Source/core/platform/chromium/support/WebFilterOperation.cpp |
rename to Source/common/WebFilterOperation.cpp |
index d948cb2f865d5f81355344dc26a7450642281296..1ecd089e107fbe41820a1481a79673b089baca42 100644 |
--- a/Source/core/platform/chromium/support/WebFilterOperation.cpp |
+++ b/Source/common/WebFilterOperation.cpp |
@@ -24,9 +24,7 @@ |
*/ |
#include "config.h" |
-#include "public/platform/WebFilterOperation.h" |
- |
-#include <string.h> |
+#include "public/common/WebFilterOperation.h" |
namespace WebKit { |
@@ -38,16 +36,19 @@ bool WebFilterOperation::equals(const WebFilterOperation& other) const |
return !memcmp(m_matrix, other.m_matrix, sizeof(m_matrix)); |
if (m_type == FilterTypeDropShadow) { |
return m_amount == other.m_amount |
- && m_dropShadowOffset == other.m_dropShadowOffset |
+ && m_dropShadowOffsetX == other.m_dropShadowOffsetX |
+ && m_dropShadowOffsetY == other.m_dropShadowOffsetY |
&& m_dropShadowColor == other.m_dropShadowColor; |
- } else |
+ } else { |
return m_amount == other.m_amount; |
+ } |
} |
WebFilterOperation::WebFilterOperation(FilterType type, SkScalar matrix[20]) |
: m_type(type) |
, m_amount(0) |
- , m_dropShadowOffset(0, 0) |
+ , m_dropShadowOffsetX(0) |
+ , m_dropShadowOffsetY(0) |
, m_dropShadowColor(0) |
, m_zoomInset(0) |
{ |