Merge 132528

Source/WebCore/platform/graphics/filters/FilterOperation.h

Index: Source/WebCore/platform/graphics/filters/FilterOperation.h
===================================================================
--- Source/WebCore/platform/graphics/filters/FilterOperation.h	(revision 132835)
+++ Source/WebCore/platform/graphics/filters/FilterOperation.h	(working copy)
@@ -161,14 +161,19 @@
         return adoptRef(new ReferenceFilterOperation(url, fragment, type));
     }
 
+    class Data {
+    public:
+        virtual ~Data() { }
+    };
+
     virtual bool affectsOpacity() const { return true; }
     virtual bool movesPixels() const { return true; }
 
     const String& url() const { return m_url; }
     const String& fragment() const { return m_fragment; }
 
-    void* data() const { return m_data; }
-    void setData(void* data) { m_data = data; }
+    Data* data() const { return m_data.get(); }
+    void setData(PassOwnPtr<Data> data) { m_data = data; }
 
 private:
 
@@ -184,13 +189,12 @@
         : FilterOperation(type)
         , m_url(url)
         , m_fragment(fragment)
-        , m_data(0)
     {
     }
 
     String m_url;
     String m_fragment;
-    void* m_data;
+    OwnPtr<Data> m_data;
 };
 
 // GRAYSCALE, SEPIA, SATURATE and HUE_ROTATE are variations on a basic color matrix effect.