Diff
Modified: trunk/Source/WebCore/ChangeLog (133770 => 133771)
--- trunk/Source/WebCore/ChangeLog 2012-11-07 17:39:26 UTC (rev 133770)
+++ trunk/Source/WebCore/ChangeLog 2012-11-07 17:46:53 UTC (rev 133771)
@@ -1,3 +1,26 @@
+2012-11-07 Alexandru Chiculita <ach...@adobe.com>
+
+ [CSS Shaders] Add CustomFilterMeshBoxType to ValidatedCustomFilterOperation
+ https://bugs.webkit.org/show_bug.cgi?id=100890
+
+ Reviewed by Dean Jackson.
+
+ Added the CustomFilterMeshBoxType parameter to the ValidatedCustomFilterOperation.
+
+ No new tests, this parameter is not used in the implementation yet.
+
+ * platform/graphics/filters/ValidatedCustomFilterOperation.cpp:
+ (WebCore::ValidatedCustomFilterOperation::ValidatedCustomFilterOperation):
+ * platform/graphics/filters/ValidatedCustomFilterOperation.h:
+ (WebCore::ValidatedCustomFilterOperation::create):
+ (WebCore::ValidatedCustomFilterOperation::meshBoxType):
+ (WebCore::ValidatedCustomFilterOperation::operator==):
+ (ValidatedCustomFilterOperation):
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::createCustomFilterEffect):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::computeFilterOperations):
+
2012-11-07 Sergio Villar Senin <svil...@igalia.com>
[Qt] Implement deleteCookie() for persistent storage
Modified: trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.cpp (133770 => 133771)
--- trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.cpp 2012-11-07 17:39:26 UTC (rev 133770)
+++ trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.cpp 2012-11-07 17:46:53 UTC (rev 133771)
@@ -40,12 +40,13 @@
namespace WebCore {
ValidatedCustomFilterOperation::ValidatedCustomFilterOperation(PassRefPtr<CustomFilterValidatedProgram> validatedProgram,
- const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+ const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshBoxType meshBoxType, CustomFilterMeshType meshType)
: FilterOperation(VALIDATED_CUSTOM)
, m_validatedProgram(validatedProgram)
, m_parameters(sortedParameters)
, m_meshRows(meshRows)
, m_meshColumns(meshColumns)
+ , m_meshBoxType(meshBoxType)
, m_meshType(meshType)
{
}
Modified: trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.h (133770 => 133771)
--- trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.h 2012-11-07 17:39:26 UTC (rev 133770)
+++ trunk/Source/WebCore/platform/graphics/filters/ValidatedCustomFilterOperation.h 2012-11-07 17:46:53 UTC (rev 133771)
@@ -43,9 +43,9 @@
class ValidatedCustomFilterOperation : public FilterOperation {
public:
static PassRefPtr<ValidatedCustomFilterOperation> create(PassRefPtr<CustomFilterValidatedProgram> validatedProgram,
- const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType meshType)
+ const CustomFilterParameterList& sortedParameters, unsigned meshRows, unsigned meshColumns, CustomFilterMeshBoxType meshBoxType, CustomFilterMeshType meshType)
{
- return adoptRef(new ValidatedCustomFilterOperation(validatedProgram, sortedParameters, meshRows, meshColumns, meshType));
+ return adoptRef(new ValidatedCustomFilterOperation(validatedProgram, sortedParameters, meshRows, meshColumns, meshBoxType, meshType));
}
virtual ~ValidatedCustomFilterOperation();
@@ -62,6 +62,7 @@
unsigned meshRows() const { return m_meshRows; }
unsigned meshColumns() const { return m_meshColumns; }
+ CustomFilterMeshBoxType meshBoxType() const { return m_meshBoxType; }
CustomFilterMeshType meshType() const { return m_meshType; }
private:
@@ -74,21 +75,20 @@
return m_validatedProgram.get() == other->m_validatedProgram.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;
}
- ValidatedCustomFilterOperation(PassRefPtr<CustomFilterValidatedProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns, CustomFilterMeshType);
+ ValidatedCustomFilterOperation(PassRefPtr<CustomFilterValidatedProgram>, const CustomFilterParameterList&, unsigned meshRows, unsigned meshColumns, CustomFilterMeshBoxType, CustomFilterMeshType);
RefPtr<CustomFilterValidatedProgram> m_validatedProgram;
CustomFilterParameterList m_parameters;
unsigned m_meshRows;
unsigned m_meshColumns;
+ CustomFilterMeshBoxType m_meshBoxType;
CustomFilterMeshType m_meshType;
-
- // FIXME: Add CustomFilterMeshBoxType after 100782 is landed.
- // https://bugs.webkit.org/show_bug.cgi?id=100890
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (133770 => 133771)
--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-11-07 17:39:26 UTC (rev 133770)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-11-07 17:46:53 UTC (rev 133771)
@@ -43,7 +43,6 @@
#include <wtf/MathExtras.h>
#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
-#include "CustomFilterConstants.h"
#include "CustomFilterGlobalContext.h"
#include "CustomFilterOperation.h"
#include "CustomFilterProgram.h"
@@ -94,11 +93,8 @@
if (!globalContext->context())
return 0;
- // FIXME: Use the right CustomFilterMeshBoxType when that will be available on the ValidatedCustomFilterOperation.
- // Right now the implementation doesn't use that parameter anyway, so just pass the default MeshBoxTypeFilter.
- // https://bugs.webkit.org/show_bug.cgi?id=100890
return FECustomFilter::create(filter, globalContext->context(), operation->validatedProgram(), operation->parameters(),
- operation->meshRows(), operation->meshColumns(), MeshBoxTypeFilter, operation->meshType());
+ operation->meshRows(), operation->meshColumns(), operation->meshBoxType(), operation->meshType());
}
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (133770 => 133771)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-11-07 17:39:26 UTC (rev 133770)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-11-07 17:46:53 UTC (rev 133771)
@@ -5145,7 +5145,7 @@
continue;
RefPtr<ValidatedCustomFilterOperation> validatedOperation = ValidatedCustomFilterOperation::create(validatedProgram.release(),
- customOperation->parameters(), customOperation->meshRows(), customOperation->meshColumns(), customOperation->meshType());
+ customOperation->parameters(), customOperation->meshRows(), customOperation->meshColumns(), customOperation->meshBoxType(), customOperation->meshType());
outputFilters.operations().append(validatedOperation.release());
continue;
}
