Modified: trunk/Source/WebCore/ChangeLog (152533 => 152534)
--- trunk/Source/WebCore/ChangeLog 2013-07-10 10:05:25 UTC (rev 152533)
+++ trunk/Source/WebCore/ChangeLog 2013-07-10 13:57:06 UTC (rev 152534)
@@ -1,3 +1,19 @@
+2013-07-10 Sergio Correia <[email protected]>
+
+ Remove the meshType from CoordinatedCustomFilterOperation
+ https://bugs.webkit.org/show_bug.cgi?id=118529
+
+ Reviewed by Noam Rosenthal.
+
+ Following the removal of the meshType from CustomFilterOperation in r149153,
+ remove also the meshType from CoordinatedCustomFilterOperation.
+
+ No new tests, no new functionality.
+
+ * platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h:
+ (WebCore::CoordinatedCustomFilterOperation::create): Remove unused meshType parameter.
+ (WebCore::CoordinatedCustomFilterOperation::CoordinatedCustomFilterOperation): Ditto.
+ Ditto.
2013-07-10 James Craig <[email protected]>
AX: AccessibilityNodeObject::supportsRequiredAttribute() should switch on CellRole
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h (152533 => 152534)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h 2013-07-10 10:05:25 UTC (rev 152533)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedCustomFilterOperation.h 2013-07-10 13:57:06 UTC (rev 152534)
@@ -42,15 +42,15 @@
class CoordinatedCustomFilterOperation : public CustomFilterOperation {
public:
- static PassRefPtr<CoordinatedCustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, int programID, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+ static PassRefPtr<CoordinatedCustomFilterOperation> create(PassRefPtr<CustomFilterProgram> program, int programID, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns)
{
- return adoptRef(new CoordinatedCustomFilterOperation(program, programID, sortedParameters, meshRows, meshColumns, meshType));
+ return adoptRef(new CoordinatedCustomFilterOperation(program, programID, sortedParameters, meshRows, meshColumns));
}
int programID() const { return m_programID; }
private:
- CoordinatedCustomFilterOperation(PassRefPtr<CustomFilterProgram> program, int programID, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+ CoordinatedCustomFilterOperation(PassRefPtr<CustomFilterProgram> program, int programID, const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns)
: CustomFilterOperation(program, sortedParameters, meshRows, meshColumns)
, m_programID(programID)
{
Modified: trunk/Source/WebKit2/ChangeLog (152533 => 152534)
--- trunk/Source/WebKit2/ChangeLog 2013-07-10 10:05:25 UTC (rev 152533)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-10 13:57:06 UTC (rev 152534)
@@ -1,3 +1,20 @@
+2013-07-10 Sergio Correia <[email protected]>
+
+ Remove the meshType from CoordinatedCustomFilterOperation
+ https://bugs.webkit.org/show_bug.cgi?id=118529
+
+ Reviewed by Noam Rosenthal.
+
+ Following the removal of the meshType from CustomFilterOperation in r149153,
+ remove also the meshType from CoordinatedCustomFilterOperation.
+
+ No new tests, no new functionality.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (CoreIPC::::encode): Remove dead comment.
+ (CoreIPC::::decode): Remove meshType from CoordinatedCustomFilterOperation
+ call.
+
2013-07-09 Byungwoo Lee <[email protected]>
[EFL] tooltip callback doesn't work.
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (152533 => 152534)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-07-10 10:05:25 UTC (rev 152533)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-07-10 13:57:06 UTC (rev 152534)
@@ -153,8 +153,6 @@
ASSERT(program->platformCompiledProgram()->client());
WebCustomFilterProgramProxy* customFilterProgramProxy = static_cast<WebCustomFilterProgramProxy*>(program->platformCompiledProgram()->client());
const CustomFilterProgramInfo& programInfo = program->programInfo();
- // FIXME: CustomFilterOperation should not need the meshType, it should just be encoded in the program itself.
- // https://bugs.webkit.org/show_bug.cgi?id=102529
encoder.encodeEnum(programInfo.meshType());
encoder << customFilterProgramProxy->id();
CustomFilterParameterList parameters = customOperation->parameters();
@@ -338,7 +336,7 @@
return false;
// At this point the Shaders are already validated, so we just use WebCustomFilterOperation for transportation.
- filter = CoordinatedCustomFilterOperation::create(0, programID, parameters, meshRows, meshColumns, meshType);
+ filter = CoordinatedCustomFilterOperation::create(0, programID, parameters, meshRows, meshColumns);
break;
}
#endif
