Index: third_party/WebKit/Source/platform/animation/WebFilterOperations.h |
diff --git a/third_party/WebKit/public/platform/WebFilterOperations.h b/third_party/WebKit/Source/platform/animation/WebFilterOperations.h |
similarity index 59% |
rename from third_party/WebKit/public/platform/WebFilterOperations.h |
rename to third_party/WebKit/Source/platform/animation/WebFilterOperations.h |
index 4cb2e525e11eca452389263544fb7e2e5545ef82..cc2bbf7fb382ac1c2a1f13a6007ab2b3ed9e59e3 100644 |
--- a/third_party/WebKit/public/platform/WebFilterOperations.h |
+++ b/third_party/WebKit/Source/platform/animation/WebFilterOperations.h |
@@ -28,35 +28,43 @@ |
#include "SkImageFilter.h" |
#include "SkScalar.h" |
-#include "WebColor.h" |
-#include "WebPoint.h" |
+#include "cc/output/filter_operations.h" |
+#include "platform/PlatformExport.h" |
+#include "public/platform/WebColor.h" |
+#include "public/platform/WebPoint.h" |
namespace blink { |
// An ordered list of filter operations. |
-class WebFilterOperations { |
+class PLATFORM_EXPORT WebFilterOperations { |
public: |
- virtual ~WebFilterOperations() { } |
+ WebFilterOperations(); |
+ virtual ~WebFilterOperations(); |
- virtual void appendGrayscaleFilter(float amount) = 0; |
- virtual void appendSepiaFilter(float amount) = 0; |
- virtual void appendSaturateFilter(float amount) = 0; |
- virtual void appendHueRotateFilter(float amount) = 0; |
- virtual void appendInvertFilter(float amount) = 0; |
- virtual void appendBrightnessFilter(float amount) = 0; |
- virtual void appendContrastFilter(float amount) = 0; |
- virtual void appendOpacityFilter(float amount)= 0; |
- virtual void appendBlurFilter(float amount) = 0; |
- virtual void appendDropShadowFilter(WebPoint offset, float stdDeviation, WebColor) = 0; |
- virtual void appendColorMatrixFilter(SkScalar matrix[20]) = 0; |
- virtual void appendZoomFilter(float amount, int inset) = 0; |
- virtual void appendSaturatingBrightnessFilter(float amount) = 0; |
+ const cc::FilterOperations& AsFilterOperations() const; |
+ |
+ virtual void appendGrayscaleFilter(float amount); |
+ virtual void appendSepiaFilter(float amount); |
+ virtual void appendSaturateFilter(float amount); |
+ virtual void appendHueRotateFilter(float amount); |
+ virtual void appendInvertFilter(float amount); |
+ virtual void appendBrightnessFilter(float amount); |
+ virtual void appendContrastFilter(float amount); |
+ virtual void appendOpacityFilter(float amount); |
+ virtual void appendBlurFilter(float amount); |
+ virtual void appendDropShadowFilter(WebPoint offset, float stdDeviation, WebColor); |
+ virtual void appendColorMatrixFilter(SkScalar matrix[20]); |
+ virtual void appendZoomFilter(float amount, int inset); |
+ virtual void appendSaturatingBrightnessFilter(float amount); |
// This grabs a ref on the passed-in filter. |
- virtual void appendReferenceFilter(SkImageFilter*) = 0; |
+ virtual void appendReferenceFilter(SkImageFilter*); |
+ |
+ virtual void clear(); |
+ virtual bool isEmpty() const; |
- virtual void clear() = 0; |
- virtual bool isEmpty() const = 0; |
+private: |
+ cc::FilterOperations m_filterOperations; |
}; |
} // namespace blink |