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 55%
rename from third_party/WebKit/public/platform/WebFilterOperations.h
rename to third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
index 4cb2e525e11eca452389263544fb7e2e5545ef82..8e4dc28b9f050f19e4a84ae7cd0536790050c5db 100644
--- a/third_party/WebKit/public/platform/WebFilterOperations.h
+++ b/third_party/WebKit/Source/platform/graphics/CompositorFilterOperations.h
@@ -23,42 +23,50 @@
  * 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"
 #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 CompositorFilterOperations {

[jbroman, 2016/01/29 15:29:18]

Is this virtual purely for the mock used in tests?

If so, I'd think it would be nicer to have this be non-virtual, and instead have
the tests query the actual data that was stored, like:

ASSERT_EQ(FilterOperation::createGrayscaleFilter(0.5),
outOps.asFilterOperations().at(0));

(That might be better as a follow-up patch, though.)

[loyso (OOO), 2016/02/01 05:31:32]

Yup.
Yes, that was one of the intentions - to get rid of virtuals and inline where
critical. This CL is just a beginning.

 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(WebPoint offset, float stdDeviation, WebColor);

[jbroman, 2016/01/29 15:29:18]

IntPoint, Color

[loyso (OOO), 2016/02/01 05:31:32]

Done.

+    virtual void appendColorMatrixFilter(SkScalar matrix[20]);

[jbroman, 2016/01/29 15:29:18]

Is this called anywhere? I was wondering what we stored this as in Blink before
calling this, but I can't actually find any call sites of
appendColorMatrixFilter.

[loyso (OOO), 2016/02/01 05:31:32]

Maybe we wanted it to be implemented as accelerated animation. Should I erase it
in this CL?

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

OK to leave it for now (since this is mostly a code-movement CL), but it would
be nice to remove dead code at some point. :)

+    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