Diff
Modified: trunk/Source/WebCore/ChangeLog (149152 => 149153)
--- trunk/Source/WebCore/ChangeLog 2013-04-25 22:52:34 UTC (rev 149152)
+++ trunk/Source/WebCore/ChangeLog 2013-04-25 23:06:35 UTC (rev 149153)
@@ -1,3 +1,28 @@
+2013-04-25 Qiankun Miao <[email protected]>
+
+ [CSS Shaders] Remove the meshType from the CustomFilterOperation
+ https://bugs.webkit.org/show_bug.cgi?id=102529
+
+ Reviewed by Dean Jackson.
+
+ No new tests, no new functionality.
+
+ MeshType can be accessed from program, so remove the m_meshType
+ related code in CustomFilterOperation.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
+ * platform/graphics/filters/CustomFilterOperation.cpp:
+ (WebCore::CustomFilterOperation::CustomFilterOperation):
+ (WebCore::CustomFilterOperation::blend):
+ * platform/graphics/filters/CustomFilterOperation.h:
+ (WebCore::CustomFilterOperation::create):
+ (WebCore::CustomFilterOperation::meshType):
+ (CustomFilterOperation):
+ (WebCore::CustomFilterOperation::operator==):
+ * platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h:
+ (WebCore::CoordinatedCustomFilterOperation::CoordinatedCustomFilterOperation):
+
2013-04-25 Kent Tamura <[email protected]>
Ignore invalid regular expressions for input[pattern].
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (149152 => 149153)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-04-25 22:52:34 UTC (rev 149152)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-04-25 23:06:35 UTC (rev 149153)
@@ -3903,7 +3903,7 @@
return 0;
RefPtr<CustomFilterProgram> program = lookupCustomFilterProgram(vertexShader, fragmentShader, programType, mixSettings, meshType);
- return CustomFilterOperation::create(program.release(), parameterList, meshRows, meshColumns, meshType);
+ return CustomFilterOperation::create(program.release(), parameterList, meshRows, meshColumns);
}
PassRefPtr<CustomFilterOperation> StyleResolver::createCustomFilterOperation(WebKitCSSFilterValue* filterValue)
Modified: trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.cpp (149152 => 149153)
--- trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.cpp 2013-04-25 22:52:34 UTC (rev 149152)
+++ trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.cpp 2013-04-25 23:06:35 UTC (rev 149153)
@@ -38,13 +38,12 @@
namespace WebCore {
-CustomFilterOperation::CustomFilterOperation(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+CustomFilterOperation::CustomFilterOperation(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns)
: FilterOperation(CUSTOM)
, m_program(program)
, m_parameters(sortedParameters)
, m_meshRows(meshRows)
, m_meshColumns(meshColumns)
- , m_meshType(meshType)
{
// Make sure that the parameters are alwyas sorted by name. We use that to merge two CustomFilterOperations in animations.
ASSERT(m_parameters.checkAlphabeticalOrder());
@@ -65,13 +64,12 @@
const CustomFilterOperation* fromOp = static_cast<const CustomFilterOperation*>(from);
if (m_program.get() != fromOp->m_program.get()
|| m_meshRows != fromOp->m_meshRows
- || m_meshColumns != fromOp->m_meshColumns
- || m_meshType != fromOp->m_meshType)
+ || m_meshColumns != fromOp->m_meshColumns)
return this;
CustomFilterParameterList animatedParameters;
m_parameters.blend(fromOp->m_parameters, progress, size, animatedParameters);
- return CustomFilterOperation::create(m_program, animatedParameters, m_meshRows, m_meshColumns, m_meshType);
+ return CustomFilterOperation::create(m_program, animatedParameters, m_meshRows, m_meshColumns);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h (149152 => 149153)
--- trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h 2013-04-25 22:52:34 UTC (rev 149152)
+++ trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h 2013-04-25 23:06:35 UTC (rev 149153)
@@ -43,9 +43,9 @@
class CustomFilterOperation : public FilterOperation {
public:
- static PassRefPtr<CustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+ static PassRefPtr<CustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns)
{
- return adoptRef(new CustomFilterOperation(program, sortedParameters, meshRows, meshColumns, meshType));
+ return adoptRef(new CustomFilterOperation(program, sortedParameters, meshRows, meshColumns));
}
CustomFilterProgram* program() const { return m_program.get(); }
@@ -56,7 +56,7 @@
unsigned meshRows() const { return m_meshRows; }
unsigned meshColumns() const { return m_meshColumns; }
- CustomFilterMeshType meshType() const { return m_meshType; }
+ CustomFilterMeshType meshType() const { return program() ? program()->meshType() : MeshTypeAttached; }
virtual ~CustomFilterOperation();
@@ -67,7 +67,7 @@
virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, const LayoutSize&, bool blendToPassthrough = false);
protected:
- CustomFilterOperation(PassRefPtr<CustomFilterProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType);
+ CustomFilterOperation(PassRefPtr<CustomFilterProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns);
private:
virtual bool operator==(const FilterOperation& o) const
@@ -79,7 +79,6 @@
return m_program.get() == other->m_program.get()
&& m_meshRows == other->m_meshRows
&& m_meshColumns == other->m_meshColumns
- && m_meshType == other->m_meshType
&& m_parameters == other->m_parameters;
}
@@ -88,7 +87,6 @@
unsigned m_meshRows;
unsigned m_meshColumns;
- CustomFilterMeshType m_meshType;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h (149152 => 149153)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h 2013-04-25 22:52:34 UTC (rev 149152)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h 2013-04-25 23:06:35 UTC (rev 149153)
@@ -51,7 +51,7 @@
private:
CoordinatedCustomFilterOperation(PassRefPtr<CustomFilterProgram> program, int programID, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
- : CustomFilterOperation(program, sortedParameters, meshRows, meshColumns, meshType)
+ : CustomFilterOperation(program, sortedParameters, meshRows, meshColumns)
, m_programID(programID)
{
}
