Merge 132528

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

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 143 matching lines @@
     }
 };
 
 class ReferenceFilterOperation : public FilterOperation {
 public:
     static PassRefPtr<ReferenceFilterOperation> create(const String& url, const String& fragment, OperationType type)
     {
         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:
 
     virtual bool operator==(const FilterOperation& o) const
     {
         if (!isSameType(o))
             return false;
         const ReferenceFilterOperation* other = static_cast<const ReferenceFilterOperation*>(&o);
         return m_url == other->m_url;
     }
 
     ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
         : 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.
 // For HUE_ROTATE, the angle of rotation is stored in m_amount.
 class BasicColorMatrixFilterOperation : public FilterOperation {
 public:
     static PassRefPtr<BasicColorMatrixFilterOperation> create(double amount, OperationType type)
     {
         return adoptRef(new BasicColorMatrixFilterOperation(amount, type));
     }
@@ skipping 162 matching lines @@
     IntPoint m_location; // FIXME: should location be in Lengths?
     int m_stdDeviation;
     Color m_color;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(CSS_FILTERS)
 
 #endif // FilterOperation_h