CC Animation: Move files from cc_blink to Source/platform/animation

third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h

Index: third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
diff --git a/third_party/WebKit/public/platform/WebFilterOperations.h b/third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
similarity index 51%
rename from third_party/WebKit/public/platform/WebFilterOperations.h
rename to third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
index 4cb2e525e11eca452389263544fb7e2e5545ef82..9e7729c762f9248f4f3bea6a51dd2582e9eaa9b8 100644
--- a/third_party/WebKit/public/platform/WebFilterOperations.h
+++ b/third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
@@ -23,42 +23,52 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebFilterOperations_h
-#define WebFilterOperations_h
+#ifndef CompositorFilterOperations_h
+#define CompositorFilterOperations_h
 
 #include "SkImageFilter.h"

[jbroman, 2016/02/01 15:44:36]

use full include paths to Skia, like
"third_party/skia/include/core/SkImageFilter.h" (and re-sort)

(For SkImageFilter, you can probably get away with just a forward declaration,
but in this case I don't think it's a big deal either way.)

[loyso (OOO), 2016/02/04 05:49:29]

Done.

 #include "SkScalar.h"
-#include "WebColor.h"
-#include "WebPoint.h"
+#include "cc/output/filter_operations.h"
+#include "platform/PlatformExport.h"
+#include "platform/geometry/IntPoint.h"
+#include "platform/graphics/Color.h"
+#include "wtf/Noncopyable.h"
 
 namespace blink {
 
 // An ordered list of filter operations.
-class WebFilterOperations {
+class PLATFORM_EXPORT CompositorFilterOperations {
+    WTF_MAKE_NONCOPYABLE(CompositorFilterOperations);
 public:
-    virtual ~WebFilterOperations() { }
+    CompositorFilterOperations();
+    virtual ~CompositorFilterOperations();
 
-    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(IntPoint offset, float stdDeviation, Color);
+    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
 
-#endif // WebFilterOperations_h
+#endif // CompositorFilterOperations_h