1 files changed, 5 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/filters/CustomFilterProgramInfo.h b/Source/WebCore/platform/graphics/filters/CustomFilterProgramInfo.h
index 52fe77157..3b544c5ad 100644
--- a/Source/WebCore/platform/graphics/filters/CustomFilterProgramInfo.h
+++ b/Source/WebCore/platform/graphics/filters/CustomFilterProgramInfo.h
@@ -45,19 +45,16 @@ enum CustomFilterProgramType {
 
 struct CustomFilterProgramMixSettings {
     CustomFilterProgramMixSettings()
-        : enabled(false)
-        , blendMode(BlendModeNormal)
+        : blendMode(BlendModeNormal)
         , compositeOperator(CompositeSourceOver)
     {
     }
     
     bool operator==(const CustomFilterProgramMixSettings& o) const
     {
-        return (!enabled && !o.enabled)
-            || (blendMode == o.blendMode && compositeOperator == o.compositeOperator);
+        return blendMode == o.blendMode && compositeOperator == o.compositeOperator;
     }
     
-    bool enabled;
     BlendMode blendMode;
     CompositeOperator compositeOperator;
 };
@@ -67,7 +64,7 @@ struct CustomFilterProgramMixSettings {
 // Null strings are placeholders for the default shader.
 class CustomFilterProgramInfo {
 public:
-    CustomFilterProgramInfo(const String&, const String&, const CustomFilterProgramMixSettings&);
+    CustomFilterProgramInfo(const String&, const String&, CustomFilterProgramType, const CustomFilterProgramMixSettings&);
 
     CustomFilterProgramInfo();
     bool isEmptyValue() const;
@@ -80,13 +77,12 @@ public:
 
     const String& vertexShaderString() const { return m_vertexShaderString; }
     const String& fragmentShaderString() const { return m_fragmentShaderString; }
-    // FIXME: We should add CustomFilterProgramType to CustomFilterProgramInfo and remove mixSettings.enabled.
-    // https://bugs.webkit.org/show_bug.cgi?id=96448
-    CustomFilterProgramType programType() const { return m_mixSettings.enabled ? PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE : PROGRAM_TYPE_NO_ELEMENT_TEXTURE; }
+    CustomFilterProgramType programType() const { return m_programType; }
     const CustomFilterProgramMixSettings& mixSettings() const { return m_mixSettings; }
 private:
     String m_vertexShaderString;
     String m_fragmentShaderString;
+    CustomFilterProgramType m_programType;
     CustomFilterProgramMixSettings m_mixSettings;
 };