1 files changed, 6 insertions, 11 deletions
diff --git a/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h b/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h
index 7153e61e7..447c6058c 100644
--- a/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h
+++ b/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h
@@ -43,9 +43,9 @@ namespace WebCore {
 
 class CustomFilterOperation : public FilterOperation {
 public:
-    static PassRefPtr<CustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshBoxType meshBoxType, CustomFilterMeshType meshType)
+    static PassRefPtr<CustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns)
     {
-        return adoptRef(new CustomFilterOperation(program, sortedParameters, meshRows, meshColumns, meshBoxType, meshType));
+        return adoptRef(new CustomFilterOperation(program, sortedParameters, meshRows, meshColumns));
     }
     
     CustomFilterProgram* program() const { return m_program.get(); }
@@ -55,9 +55,8 @@ public:
     
     unsigned meshRows() const { return m_meshRows; }
     unsigned meshColumns() const { return m_meshColumns; }
-    
-    CustomFilterMeshBoxType meshBoxType() const { return m_meshBoxType; }
-    CustomFilterMeshType meshType() const { return m_meshType; }
+
+    CustomFilterMeshType meshType() const { return program() ? program()->meshType() : MeshTypeAttached; }
     
     virtual ~CustomFilterOperation();
     
@@ -68,7 +67,7 @@ public:
     virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, const LayoutSize&, bool blendToPassthrough = false);
 
 protected:
-    CustomFilterOperation(PassRefPtr<CustomFilterProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns, CustomFilterMeshBoxType, CustomFilterMeshType);
+    CustomFilterOperation(PassRefPtr<CustomFilterProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns);
     
 private:
     virtual bool operator==(const FilterOperation& o) const
@@ -77,11 +76,9 @@ private:
             return false;
 
         const CustomFilterOperation* other = static_cast<const CustomFilterOperation*>(&o);
-        return *m_program.get() == *other->m_program.get()
+        return m_program.get() == other->m_program.get()
             && m_meshRows == other->m_meshRows
             && m_meshColumns == other->m_meshColumns
-            && m_meshBoxType == other->m_meshBoxType
-            && m_meshType == other->m_meshType
             && m_parameters == other->m_parameters;
     }
 
@@ -90,8 +87,6 @@ private:
     
     unsigned m_meshRows;
     unsigned m_meshColumns;
-    CustomFilterMeshBoxType m_meshBoxType;
-    CustomFilterMeshType m_meshType;
 };
 
 } // namespace WebCore