Diff
Modified: trunk/Source/WebCore/ChangeLog (225025 => 225026)
--- trunk/Source/WebCore/ChangeLog 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/ChangeLog 2017-11-19 01:55:37 UTC (rev 225026)
@@ -1,5 +1,173 @@
2017-11-18 Simon Fraser <[email protected]>
+ Mechanical cleanup of FE* files
+ https://bugs.webkit.org/show_bug.cgi?id=179868
+
+ Reviewed by Wenson Hsieh.
+
+ Remove unused dump() functions.
+ Make overridden member functions in derived classes private.
+ Make simple getters inline.
+
+ Move common FESpecularLighting and FEDiffuseLighting functions into the
+ FELighting base class.
+
+ * platform/graphics/filters/FEBlend.cpp:
+ (WebCore::FEBlend::blendMode const): Deleted.
+ (WebCore::FEBlend::dump): Deleted.
+ * platform/graphics/filters/FEBlend.h:
+ (WebCore::FEBlend::blendMode const):
+ * platform/graphics/filters/FEColorMatrix.cpp:
+ (WebCore::FEColorMatrix::type const): Deleted.
+ (WebCore::FEColorMatrix::values const): Deleted.
+ (WebCore::FEColorMatrix::dump): Deleted.
+ * platform/graphics/filters/FEColorMatrix.h:
+ (WebCore::FEColorMatrix::type const):
+ (WebCore::FEColorMatrix::values const):
+ * platform/graphics/filters/FEComponentTransfer.cpp:
+ (WebCore::FEComponentTransfer::redFunction const): Deleted.
+ (WebCore::FEComponentTransfer::greenFunction const): Deleted.
+ (WebCore::FEComponentTransfer::blueFunction const): Deleted.
+ (WebCore::FEComponentTransfer::alphaFunction const): Deleted.
+ (WebCore::FEComponentTransfer::dump): Deleted.
+ * platform/graphics/filters/FEComponentTransfer.h:
+ (WebCore::FEComponentTransfer::redFunction const):
+ (WebCore::FEComponentTransfer::greenFunction const):
+ (WebCore::FEComponentTransfer::blueFunction const):
+ (WebCore::FEComponentTransfer::alphaFunction const):
+ * platform/graphics/filters/FEComposite.cpp:
+ (WebCore::FEComposite::operation const): Deleted.
+ (WebCore::FEComposite::k1 const): Deleted.
+ (WebCore::FEComposite::k2 const): Deleted.
+ (WebCore::FEComposite::k3 const): Deleted.
+ (WebCore::FEComposite::k4 const): Deleted.
+ (WebCore::FEComposite::dump): Deleted.
+ * platform/graphics/filters/FEComposite.h:
+ (WebCore::FEComposite::operation const):
+ (WebCore::FEComposite::k1 const):
+ (WebCore::FEComposite::k2 const):
+ (WebCore::FEComposite::k3 const):
+ (WebCore::FEComposite::k4 const):
+ * platform/graphics/filters/FEConvolveMatrix.cpp:
+ (WebCore::FEConvolveMatrix::kernelSize const): Deleted.
+ (WebCore::FEConvolveMatrix::kernel const): Deleted.
+ (WebCore::FEConvolveMatrix::divisor const): Deleted.
+ (WebCore::FEConvolveMatrix::bias const): Deleted.
+ (WebCore::FEConvolveMatrix::targetOffset const): Deleted.
+ (WebCore::FEConvolveMatrix::edgeMode const): Deleted.
+ (WebCore::FEConvolveMatrix::kernelUnitLength const): Deleted.
+ (WebCore::FEConvolveMatrix::preserveAlpha const): Deleted.
+ (WebCore::FEConvolveMatrix::dump): Deleted.
+ * platform/graphics/filters/FEConvolveMatrix.h:
+ (WebCore::FEConvolveMatrix::kernelSize const):
+ (WebCore::FEConvolveMatrix::kernel const):
+ (WebCore::FEConvolveMatrix::divisor const):
+ (WebCore::FEConvolveMatrix::bias const):
+ (WebCore::FEConvolveMatrix::targetOffset const):
+ (WebCore::FEConvolveMatrix::edgeMode const):
+ (WebCore::FEConvolveMatrix::kernelUnitLength const):
+ (WebCore::FEConvolveMatrix::preserveAlpha const):
+ * platform/graphics/filters/FEDiffuseLighting.cpp:
+ (WebCore::FEDiffuseLighting::lightingColor const): Deleted.
+ (WebCore::FEDiffuseLighting::setLightingColor): Deleted.
+ (WebCore::FEDiffuseLighting::surfaceScale const): Deleted.
+ (WebCore::FEDiffuseLighting::setSurfaceScale): Deleted.
+ (WebCore::FEDiffuseLighting::diffuseConstant const): Deleted.
+ (WebCore::FEDiffuseLighting::kernelUnitLengthX const): Deleted.
+ (WebCore::FEDiffuseLighting::setKernelUnitLengthX): Deleted.
+ (WebCore::FEDiffuseLighting::kernelUnitLengthY const): Deleted.
+ (WebCore::FEDiffuseLighting::setKernelUnitLengthY): Deleted.
+ (WebCore::FEDiffuseLighting::lightSource const): Deleted.
+ (WebCore::FEDiffuseLighting::dump): Deleted.
+ * platform/graphics/filters/FEDiffuseLighting.h:
+ (WebCore::FEDiffuseLighting::diffuseConstant const):
+ * platform/graphics/filters/FEDisplacementMap.cpp:
+ (WebCore::FEDisplacementMap::xChannelSelector const): Deleted.
+ (WebCore::FEDisplacementMap::yChannelSelector const): Deleted.
+ (WebCore::FEDisplacementMap::scale const): Deleted.
+ (WebCore::FEDisplacementMap::dump): Deleted.
+ * platform/graphics/filters/FEDisplacementMap.h:
+ (WebCore::FEDisplacementMap::xChannelSelector const):
+ (WebCore::FEDisplacementMap::yChannelSelector const):
+ (WebCore::FEDisplacementMap::scale const):
+ * platform/graphics/filters/FEDropShadow.cpp:
+ (WebCore::FEDropShadow::dump): Deleted.
+ * platform/graphics/filters/FEDropShadow.h:
+ * platform/graphics/filters/FEFlood.cpp:
+ (WebCore::FEFlood::floodColor const): Deleted.
+ (WebCore::FEFlood::floodOpacity const): Deleted.
+ (WebCore::FEFlood::dump): Deleted.
+ * platform/graphics/filters/FEFlood.h:
+ (WebCore::FEFlood::floodColor const):
+ (WebCore::FEFlood::floodOpacity const):
+ * platform/graphics/filters/FEGaussianBlur.cpp:
+ (WebCore::FEGaussianBlur::stdDeviationX const): Deleted.
+ (WebCore::FEGaussianBlur::stdDeviationY const): Deleted.
+ (WebCore::FEGaussianBlur::edgeMode const): Deleted.
+ (WebCore::FEGaussianBlur::dump): Deleted.
+ * platform/graphics/filters/FEGaussianBlur.h:
+ (WebCore::FEGaussianBlur::stdDeviationX const):
+ (WebCore::FEGaussianBlur::stdDeviationY const):
+ (WebCore::FEGaussianBlur::edgeMode const):
+ * platform/graphics/filters/FELighting.cpp:
+ (WebCore::FELighting::setSurfaceScale):
+ (WebCore::FELighting::setLightingColor):
+ (WebCore::FELighting::setKernelUnitLengthX):
+ (WebCore::FELighting::setKernelUnitLengthY):
+ * platform/graphics/filters/FELighting.h:
+ (WebCore::FELighting::surfaceScale const):
+ (WebCore::FELighting::lightingColor const):
+ (WebCore::FELighting::kernelUnitLengthX const):
+ (WebCore::FELighting::kernelUnitLengthY const):
+ (WebCore::FELighting::lightSource const):
+ * platform/graphics/filters/FEMerge.cpp:
+ (WebCore::FEMerge::dump): Deleted.
+ * platform/graphics/filters/FEMerge.h:
+ * platform/graphics/filters/FEMorphology.cpp:
+ (WebCore::FEMorphology::dump): Deleted.
+ * platform/graphics/filters/FEMorphology.h:
+ * platform/graphics/filters/FEOffset.cpp:
+ (WebCore::FEOffset::dx const): Deleted.
+ (WebCore::FEOffset::dy const): Deleted.
+ (WebCore::FEOffset::dump): Deleted.
+ * platform/graphics/filters/FEOffset.h:
+ (WebCore::FEOffset::dx const):
+ (WebCore::FEOffset::dy const):
+ * platform/graphics/filters/FESpecularLighting.cpp:
+ (WebCore::FESpecularLighting::lightingColor const): Deleted.
+ (WebCore::FESpecularLighting::setLightingColor): Deleted.
+ (WebCore::FESpecularLighting::surfaceScale const): Deleted.
+ (WebCore::FESpecularLighting::setSurfaceScale): Deleted.
+ (WebCore::FESpecularLighting::specularConstant const): Deleted.
+ (WebCore::FESpecularLighting::specularExponent const): Deleted.
+ (WebCore::FESpecularLighting::kernelUnitLengthX const): Deleted.
+ (WebCore::FESpecularLighting::setKernelUnitLengthX): Deleted.
+ (WebCore::FESpecularLighting::kernelUnitLengthY const): Deleted.
+ (WebCore::FESpecularLighting::setKernelUnitLengthY): Deleted.
+ (WebCore::FESpecularLighting::lightSource const): Deleted.
+ (WebCore::FESpecularLighting::dump): Deleted.
+ * platform/graphics/filters/FESpecularLighting.h:
+ (WebCore::FESpecularLighting::specularConstant const):
+ (WebCore::FESpecularLighting::specularExponent const):
+ * platform/graphics/filters/FETile.cpp:
+ (WebCore::FETile::dump): Deleted.
+ * platform/graphics/filters/FETile.h:
+ * platform/graphics/filters/FETurbulence.cpp:
+ (WebCore::FETurbulence::dump): Deleted.
+ * platform/graphics/filters/FETurbulence.h:
+ * platform/graphics/filters/FilterEffect.h:
+ * platform/graphics/filters/SourceAlpha.cpp:
+ (WebCore::SourceAlpha::dump): Deleted.
+ * platform/graphics/filters/SourceAlpha.h:
+ * platform/graphics/filters/SourceGraphic.cpp:
+ (WebCore::SourceGraphic::dump): Deleted.
+ * platform/graphics/filters/SourceGraphic.h:
+ * svg/graphics/filters/SVGFEImage.cpp:
+ (WebCore::FEImage::dump): Deleted.
+ * svg/graphics/filters/SVGFEImage.h:
+
+2017-11-18 Simon Fraser <[email protected]>
+
Attempt to fix Windows build failures seen in EWS.
Remove default constructor for ColorComponents, which was ambiguous with the
Modified: trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -46,11 +46,6 @@
return adoptRef(*new FEBlend(filter, mode));
}
-BlendMode FEBlend::blendMode() const
-{
- return m_mode;
-}
-
bool FEBlend::setBlendMode(BlendMode mode)
{
if (m_mode == mode)
@@ -80,10 +75,6 @@
}
#endif
-void FEBlend::dump()
-{
-}
-
TextStream& FEBlend::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEBlend.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEBlend.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEBlend.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -32,19 +32,18 @@
public:
static Ref<FEBlend> create(Filter&, BlendMode);
- BlendMode blendMode() const;
+ BlendMode blendMode() const { return m_mode; }
bool setBlendMode(BlendMode);
+private:
+ void platformApplySoftware() override;
void platformApplyGeneric(unsigned char* srcPixelArrayA, unsigned char* srcPixelArrayB, unsigned char* dstPixelArray,
unsigned colorArrayLength);
void platformApplyNEON(unsigned char* srcPixelArrayA, unsigned char* srcPixelArrayB, unsigned char* dstPixelArray,
unsigned colorArrayLength);
- void platformApplySoftware() override;
- void dump() override;
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-private:
FEBlend(Filter&, BlendMode);
BlendMode m_mode;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -50,11 +50,6 @@
return adoptRef(*new FEColorMatrix(filter, type, values));
}
-ColorMatrixType FEColorMatrix::type() const
-{
- return m_type;
-}
-
bool FEColorMatrix::setType(ColorMatrixType type)
{
if (m_type == type)
@@ -63,11 +58,6 @@
return true;
}
-const Vector<float>& FEColorMatrix::values() const
-{
- return m_values;
-}
-
bool FEColorMatrix::setValues(const Vector<float> &values)
{
if (m_values == values)
@@ -341,10 +331,6 @@
#endif
}
-void FEColorMatrix::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const ColorMatrixType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -40,17 +40,12 @@
public:
static Ref<FEColorMatrix> create(Filter&, ColorMatrixType, const Vector<float>&);
- ColorMatrixType type() const;
+ ColorMatrixType type() const { return m_type; }
bool setType(ColorMatrixType);
- const Vector<float>& values() const;
+ const Vector<float>& values() const { return m_values; }
bool setValues(const Vector<float>&);
- void platformApplySoftware() override;
- void dump() override;
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
static inline void calculateSaturateComponents(float* components, float value);
static inline void calculateHueRotateComponents(float* components, float value);
@@ -57,6 +52,10 @@
private:
FEColorMatrix(Filter&, ColorMatrixType, const Vector<float>&);
+ void platformApplySoftware() override;
+
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
ColorMatrixType m_type;
Vector<float> m_values;
};
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -52,41 +52,21 @@
return adoptRef(*new FEComponentTransfer(filter, redFunc, greenFunc, blueFunc, alphaFunc));
}
-ComponentTransferFunction FEComponentTransfer::redFunction() const
-{
- return m_redFunc;
-}
-
void FEComponentTransfer::setRedFunction(const ComponentTransferFunction& func)
{
m_redFunc = func;
}
-ComponentTransferFunction FEComponentTransfer::greenFunction() const
-{
- return m_greenFunc;
-}
-
void FEComponentTransfer::setGreenFunction(const ComponentTransferFunction& func)
{
m_greenFunc = func;
}
-ComponentTransferFunction FEComponentTransfer::blueFunction() const
-{
- return m_blueFunc;
-}
-
void FEComponentTransfer::setBlueFunction(const ComponentTransferFunction& func)
{
m_blueFunc = func;
}
-ComponentTransferFunction FEComponentTransfer::alphaFunction() const
-{
- return m_alphaFunc;
-}
-
void FEComponentTransfer::setAlphaFunction(const ComponentTransferFunction& func)
{
m_alphaFunc = func;
@@ -186,10 +166,6 @@
}
}
-void FEComponentTransfer::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const ComponentTransferType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -64,23 +64,18 @@
static Ref<FEComponentTransfer> create(Filter&, const ComponentTransferFunction& redFunc, const ComponentTransferFunction& greenFunc,
const ComponentTransferFunction& blueFunc, const ComponentTransferFunction& alphaFunc);
- ComponentTransferFunction redFunction() const;
+ ComponentTransferFunction redFunction() const { return m_redFunc; }
void setRedFunction(const ComponentTransferFunction&);
- ComponentTransferFunction greenFunction() const;
+ ComponentTransferFunction greenFunction() const { return m_greenFunc; }
void setGreenFunction(const ComponentTransferFunction&);
- ComponentTransferFunction blueFunction() const;
+ ComponentTransferFunction blueFunction() const { return m_blueFunc; }
void setBlueFunction(const ComponentTransferFunction&);
- ComponentTransferFunction alphaFunction() const;
+ ComponentTransferFunction alphaFunction() const { return m_alphaFunc; }
void setAlphaFunction(const ComponentTransferFunction&);
- void platformApplySoftware() override;
- void dump() override;
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
private:
FEComponentTransfer(Filter&, const ComponentTransferFunction& redFunc, const ComponentTransferFunction& greenFunc,
const ComponentTransferFunction& blueFunc, const ComponentTransferFunction& alphaFunc);
@@ -87,6 +82,10 @@
void getValues(unsigned char rValues[256], unsigned char gValues[256], unsigned char bValues[256], unsigned char aValues[256]);
+ void platformApplySoftware() override;
+
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
ComponentTransferFunction m_redFunc;
ComponentTransferFunction m_greenFunc;
ComponentTransferFunction m_blueFunc;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -48,11 +48,6 @@
return adoptRef(*new FEComposite(filter, type, k1, k2, k3, k4));
}
-CompositeOperationType FEComposite::operation() const
-{
- return m_type;
-}
-
bool FEComposite::setOperation(CompositeOperationType type)
{
if (m_type == type)
@@ -61,11 +56,6 @@
return true;
}
-float FEComposite::k1() const
-{
- return m_k1;
-}
-
bool FEComposite::setK1(float k1)
{
if (m_k1 == k1)
@@ -74,11 +64,6 @@
return true;
}
-float FEComposite::k2() const
-{
- return m_k2;
-}
-
bool FEComposite::setK2(float k2)
{
if (m_k2 == k2)
@@ -87,11 +72,6 @@
return true;
}
-float FEComposite::k3() const
-{
- return m_k3;
-}
-
bool FEComposite::setK3(float k3)
{
if (m_k3 == k3)
@@ -100,11 +80,6 @@
return true;
}
-float FEComposite::k4() const
-{
- return m_k4;
-}
-
bool FEComposite::setK4(float k4)
{
if (m_k4 == k4)
@@ -321,10 +296,6 @@
}
}
-void FEComposite::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const CompositeOperationType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -43,30 +43,21 @@
public:
static Ref<FEComposite> create(Filter&, const CompositeOperationType&, float, float, float, float);
- CompositeOperationType operation() const;
+ CompositeOperationType operation() const { return m_type; }
bool setOperation(CompositeOperationType);
- float k1() const;
+ float k1() const { return m_k1; }
bool setK1(float);
- float k2() const;
+ float k2() const { return m_k2; }
bool setK2(float);
- float k3() const;
+ float k3() const { return m_k3; }
bool setK3(float);
- float k4() const;
+ float k4() const { return m_k4; }
bool setK4(float);
- void correctFilterResultIfNeeded() override;
-
- void platformApplySoftware() override;
- void dump() override;
-
- void determineAbsolutePaintRect() override;
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
protected:
bool requiresValidPreMultipliedPixels() override { return m_type != FECOMPOSITE_OPERATOR_ARITHMETIC; }
@@ -73,6 +64,12 @@
private:
FEComposite(Filter&, const CompositeOperationType&, float, float, float, float);
+ void correctFilterResultIfNeeded() override;
+ void determineAbsolutePaintRect() override;
+
+ void platformApplySoftware() override;
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
inline void platformArithmeticSoftware(Uint8ClampedArray* source, Uint8ClampedArray* destination,
float k1, float k2, float k3, float k4);
template <int b1, int b4>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -58,12 +58,6 @@
preserveAlpha, kernelMatrix));
}
-
-IntSize FEConvolveMatrix::kernelSize() const
-{
- return m_kernelSize;
-}
-
void FEConvolveMatrix::setKernelSize(const IntSize& kernelSize)
{
ASSERT(kernelSize.width() > 0);
@@ -71,21 +65,11 @@
m_kernelSize = kernelSize;
}
-const Vector<float>& FEConvolveMatrix::kernel() const
-{
- return m_kernelMatrix;
-}
-
void FEConvolveMatrix::setKernel(const Vector<float>& kernel)
{
m_kernelMatrix = kernel;
}
-float FEConvolveMatrix::divisor() const
-{
- return m_divisor;
-}
-
bool FEConvolveMatrix::setDivisor(float divisor)
{
ASSERT(divisor);
@@ -95,11 +79,6 @@
return true;
}
-float FEConvolveMatrix::bias() const
-{
- return m_bias;
-}
-
bool FEConvolveMatrix::setBias(float bias)
{
if (m_bias == bias)
@@ -108,11 +87,6 @@
return true;
}
-IntPoint FEConvolveMatrix::targetOffset() const
-{
- return m_targetOffset;
-}
-
bool FEConvolveMatrix::setTargetOffset(const IntPoint& targetOffset)
{
if (m_targetOffset == targetOffset)
@@ -121,11 +95,6 @@
return true;
}
-EdgeModeType FEConvolveMatrix::edgeMode() const
-{
- return m_edgeMode;
-}
-
bool FEConvolveMatrix::setEdgeMode(EdgeModeType edgeMode)
{
if (m_edgeMode == edgeMode)
@@ -134,11 +103,6 @@
return true;
}
-FloatPoint FEConvolveMatrix::kernelUnitLength() const
-{
- return m_kernelUnitLength;
-}
-
bool FEConvolveMatrix::setKernelUnitLength(const FloatPoint& kernelUnitLength)
{
ASSERT(kernelUnitLength.x() > 0);
@@ -149,11 +113,6 @@
return true;
}
-bool FEConvolveMatrix::preserveAlpha() const
-{
- return m_preserveAlpha;
-}
-
bool FEConvolveMatrix::setPreserveAlpha(bool preserveAlpha)
{
if (m_preserveAlpha == preserveAlpha)
@@ -473,10 +432,6 @@
setOuterPixels(paintingData, clipRight, m_targetOffset.y(), paintSize.width(), clipBottom);
}
-void FEConvolveMatrix::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const EdgeModeType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -42,37 +42,30 @@
float, float, const IntPoint&, EdgeModeType, const FloatPoint&,
bool, const Vector<float>&);
- IntSize kernelSize() const;
+ IntSize kernelSize() const { return m_kernelSize; }
void setKernelSize(const IntSize&);
- const Vector<float>& kernel() const;
+ const Vector<float>& kernel() const { return m_kernelMatrix; }
void setKernel(const Vector<float>&);
- float divisor() const;
+ float divisor() const { return m_divisor; }
bool setDivisor(float);
- float bias() const;
+ float bias() const { return m_bias; }
bool setBias(float);
- IntPoint targetOffset() const;
+ IntPoint targetOffset() const { return m_targetOffset; }
bool setTargetOffset(const IntPoint&);
- EdgeModeType edgeMode() const;
+ EdgeModeType edgeMode() const { return m_edgeMode; }
bool setEdgeMode(EdgeModeType);
- FloatPoint kernelUnitLength() const;
+ FloatPoint kernelUnitLength() const { return m_kernelUnitLength; }
bool setKernelUnitLength(const FloatPoint&);
- bool preserveAlpha() const;
+ bool preserveAlpha() const { return m_preserveAlpha; }
bool setPreserveAlpha(bool);
- void platformApplySoftware() override;
- void dump() override;
-
- void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
private:
struct PaintingData {
@@ -87,6 +80,12 @@
FEConvolveMatrix(Filter&, const IntSize&, float, float,
const IntPoint&, EdgeModeType, const FloatPoint&, bool, const Vector<float>&);
+ void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
+
+ void platformApplySoftware() override;
+
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
template<bool preserveAlphaValues>
ALWAYS_INLINE void fastSetInteriorPixels(PaintingData&, int clipRight, int clipBottom, int yStart, int yEnd);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -39,37 +39,6 @@
FEDiffuseLighting::~FEDiffuseLighting() = default;
-const Color& FEDiffuseLighting::lightingColor() const
-{
- return m_lightingColor;
-}
-
-bool FEDiffuseLighting::setLightingColor(const Color& lightingColor)
-{
- if (m_lightingColor == lightingColor)
- return false;
- m_lightingColor = lightingColor;
- return true;
-}
-
-float FEDiffuseLighting::surfaceScale() const
-{
- return m_surfaceScale;
-}
-
-bool FEDiffuseLighting::setSurfaceScale(float surfaceScale)
-{
- if (m_surfaceScale == surfaceScale)
- return false;
- m_surfaceScale = surfaceScale;
- return true;
-}
-
-float FEDiffuseLighting::diffuseConstant() const
-{
- return m_diffuseConstant;
-}
-
bool FEDiffuseLighting::setDiffuseConstant(float diffuseConstant)
{
if (m_diffuseConstant == diffuseConstant)
@@ -78,41 +47,6 @@
return true;
}
-float FEDiffuseLighting::kernelUnitLengthX() const
-{
- return m_kernelUnitLengthX;
-}
-
-bool FEDiffuseLighting::setKernelUnitLengthX(float kernelUnitLengthX)
-{
- if (m_kernelUnitLengthX == kernelUnitLengthX)
- return false;
- m_kernelUnitLengthX = kernelUnitLengthX;
- return true;
-}
-
-float FEDiffuseLighting::kernelUnitLengthY() const
-{
- return m_kernelUnitLengthY;
-}
-
-bool FEDiffuseLighting::setKernelUnitLengthY(float kernelUnitLengthY)
-{
- if (m_kernelUnitLengthY == kernelUnitLengthY)
- return false;
- m_kernelUnitLengthY = kernelUnitLengthY;
- return true;
-}
-
-const LightSource& FEDiffuseLighting::lightSource() const
-{
- return m_lightSource.get();
-}
-
-void FEDiffuseLighting::dump()
-{
-}
-
TextStream& FEDiffuseLighting::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -32,25 +32,9 @@
static Ref<FEDiffuseLighting> create(Filter&, const Color&, float, float, float, float, Ref<LightSource>&&);
virtual ~FEDiffuseLighting();
- const Color& lightingColor() const;
- bool setLightingColor(const Color&);
-
- float surfaceScale() const;
- bool setSurfaceScale(float);
-
- float diffuseConstant() const;
+ float diffuseConstant() const { return m_diffuseConstant; }
bool setDiffuseConstant(float);
- float kernelUnitLengthX() const;
- bool setKernelUnitLengthX(float);
-
- float kernelUnitLengthY() const;
- bool setKernelUnitLengthY(float);
-
- const LightSource& lightSource() const;
-
- void dump() override;
-
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
private:
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -46,11 +46,6 @@
return adoptRef(*new FEDisplacementMap(filter, xChannelSelector, yChannelSelector, scale));
}
-ChannelSelectorType FEDisplacementMap::xChannelSelector() const
-{
- return m_xChannelSelector;
-}
-
bool FEDisplacementMap::setXChannelSelector(const ChannelSelectorType xChannelSelector)
{
if (m_xChannelSelector == xChannelSelector)
@@ -59,11 +54,6 @@
return true;
}
-ChannelSelectorType FEDisplacementMap::yChannelSelector() const
-{
- return m_yChannelSelector;
-}
-
bool FEDisplacementMap::setYChannelSelector(const ChannelSelectorType yChannelSelector)
{
if (m_yChannelSelector == yChannelSelector)
@@ -72,11 +62,6 @@
return true;
}
-float FEDisplacementMap::scale() const
-{
- return m_scale;
-}
-
bool FEDisplacementMap::setScale(float scale)
{
if (m_scale == scale)
@@ -148,10 +133,6 @@
}
}
-void FEDisplacementMap::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const ChannelSelectorType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -39,28 +39,27 @@
public:
static Ref<FEDisplacementMap> create(Filter&, ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, float);
- ChannelSelectorType xChannelSelector() const;
+ ChannelSelectorType xChannelSelector() const { return m_xChannelSelector; }
bool setXChannelSelector(const ChannelSelectorType);
- ChannelSelectorType yChannelSelector() const;
+ ChannelSelectorType yChannelSelector() const { return m_yChannelSelector; }
bool setYChannelSelector(const ChannelSelectorType);
- float scale() const;
+ float scale() const { return m_scale; }
bool setScale(float);
void setResultColorSpace(ColorSpace) override;
void transformResultColorSpace(FilterEffect*, const int) override;
+private:
+ FEDisplacementMap(Filter&, ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, float);
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-private:
- FEDisplacementMap(Filter&, ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, float);
-
ChannelSelectorType m_xChannelSelector;
ChannelSelectorType m_yChannelSelector;
float m_scale;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -112,10 +112,6 @@
resultImage->context().drawImageBuffer(*sourceImage, drawingRegion);
}
-void FEDropShadow::dump()
-{
-}
-
TextStream& FEDropShadow::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -47,16 +47,15 @@
float shadowOpacity() const { return m_shadowOpacity; }
void setShadowOpacity(float shadowOpacity) { m_shadowOpacity = shadowOpacity; }
+private:
+ FEDropShadow(Filter&, float, float, float, float, const Color&, float);
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override;
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-private:
- FEDropShadow(Filter&, float, float, float, float, const Color&, float);
-
float m_stdX;
float m_stdY;
float m_dx;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -41,11 +41,6 @@
return adoptRef(*new FEFlood(filter, floodColor, floodOpacity));
}
-const Color& FEFlood::floodColor() const
-{
- return m_floodColor;
-}
-
bool FEFlood::setFloodColor(const Color& color)
{
if (m_floodColor == color)
@@ -54,11 +49,6 @@
return true;
}
-float FEFlood::floodOpacity() const
-{
- return m_floodOpacity;
-}
-
bool FEFlood::setFloodOpacity(float floodOpacity)
{
if (m_floodOpacity == floodOpacity)
@@ -77,10 +67,6 @@
resultImage->context().fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), color);
}
-void FEFlood::dump()
-{
-}
-
TextStream& FEFlood::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEFlood.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEFlood.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEFlood.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -31,10 +31,10 @@
public:
static Ref<FEFlood> create(Filter&, const Color&, float);
- const Color& floodColor() const;
+ const Color& floodColor() const { return m_floodColor; }
bool setFloodColor(const Color&);
- float floodOpacity() const;
+ float floodOpacity() const { return m_floodOpacity; }
bool setFloodOpacity(float);
#if !USE(CG)
@@ -44,16 +44,15 @@
void setResultColorSpace(ColorSpace) override { FilterEffect::setResultColorSpace(ColorSpaceSRGB); }
#endif
+private:
+ FEFlood(Filter&, const Color&, float);
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-private:
- FEFlood(Filter&, const Color&, float);
-
Color m_floodColor;
float m_floodOpacity;
};
Modified: trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -91,31 +91,16 @@
return adoptRef(*new FEGaussianBlur(filter, x, y, edgeMode));
}
-float FEGaussianBlur::stdDeviationX() const
-{
- return m_stdX;
-}
-
void FEGaussianBlur::setStdDeviationX(float x)
{
m_stdX = x;
}
-float FEGaussianBlur::stdDeviationY() const
-{
- return m_stdY;
-}
-
void FEGaussianBlur::setStdDeviationY(float y)
{
m_stdY = y;
}
-EdgeModeType FEGaussianBlur::edgeMode() const
-{
- return m_edgeMode;
-}
-
void FEGaussianBlur::setEdgeMode(EdgeModeType edgeMode)
{
m_edgeMode = edgeMode;
@@ -558,10 +543,6 @@
platformApply(srcPixelArray, tmpImageData.get(), kernelSize.width(), kernelSize.height(), paintSize);
}
-void FEGaussianBlur::dump()
-{
-}
-
TextStream& FEGaussianBlur::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -31,25 +31,21 @@
public:
static Ref<FEGaussianBlur> create(Filter&, float, float, EdgeModeType);
- float stdDeviationX() const;
+ float stdDeviationX() const { return m_stdX; }
void setStdDeviationX(float);
- float stdDeviationY() const;
+ float stdDeviationY() const { return m_stdY; }
void setStdDeviationY(float);
- EdgeModeType edgeMode() const;
+ EdgeModeType edgeMode() const { return m_edgeMode; }
void setEdgeMode(EdgeModeType);
- void platformApplySoftware() override;
- void dump() override;
-
- void determineAbsolutePaintRect() override;
static IntSize calculateKernelSize(const Filter&, const FloatPoint& stdDeviation);
static IntSize calculateUnscaledKernelSize(const FloatPoint& stdDeviation);
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+private:
+ FEGaussianBlur(Filter&, float, float, EdgeModeType);
-private:
static const int s_minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs
template<typename Type>
@@ -65,12 +61,14 @@
unsigned kernelSizeY;
};
- static void platformApplyWorker(PlatformApplyParameters*);
+ void platformApplySoftware() override;
- FEGaussianBlur(Filter&, float, float, EdgeModeType);
+ void determineAbsolutePaintRect() override;
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
+ static void platformApplyWorker(PlatformApplyParameters*);
inline void platformApply(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
-
inline void platformApplyGeneric(Uint8ClampedArray* srcPixelArray, Uint8ClampedArray* tmpPixelArray, unsigned kernelSizeX, unsigned kernelSizeY, IntSize& paintSize);
float m_stdX;
Modified: trunk/Source/WebCore/platform/graphics/filters/FELighting.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FELighting.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FELighting.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -46,6 +46,42 @@
{
}
+bool FELighting::setSurfaceScale(float surfaceScale)
+{
+ if (m_surfaceScale == surfaceScale)
+ return false;
+
+ m_surfaceScale = surfaceScale;
+ return true;
+}
+
+bool FELighting::setLightingColor(const Color& lightingColor)
+{
+ if (m_lightingColor == lightingColor)
+ return false;
+
+ m_lightingColor = lightingColor;
+ return true;
+}
+
+bool FELighting::setKernelUnitLengthX(float kernelUnitLengthX)
+{
+ if (m_kernelUnitLengthX == kernelUnitLengthX)
+ return false;
+
+ m_kernelUnitLengthX = kernelUnitLengthX;
+ return true;
+}
+
+bool FELighting::setKernelUnitLengthY(float kernelUnitLengthY)
+{
+ if (m_kernelUnitLengthY == kernelUnitLengthY)
+ return false;
+
+ m_kernelUnitLengthY = kernelUnitLengthY;
+ return true;
+}
+
const static int cPixelSize = 4;
const static int cAlphaChannelOffset = 3;
const static unsigned char cOpaqueAlpha = static_cast<unsigned char>(0xff);
Modified: trunk/Source/WebCore/platform/graphics/filters/FELighting.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FELighting.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FELighting.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -40,10 +40,22 @@
class FELighting : public FilterEffect {
public:
- void platformApplySoftware() override;
-
void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
+ float surfaceScale() const { return m_surfaceScale; }
+ bool setSurfaceScale(float);
+
+ const Color& lightingColor() const { return m_lightingColor; }
+ bool setLightingColor(const Color&);
+
+ float kernelUnitLengthX() const { return m_kernelUnitLengthX; }
+ bool setKernelUnitLengthX(float);
+
+ float kernelUnitLengthY() const { return m_kernelUnitLengthY; }
+ bool setKernelUnitLengthY(float);
+
+ const LightSource& lightSource() const { return m_lightSource.get(); }
+
protected:
static const int s_minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs
@@ -95,6 +107,8 @@
void setPixel(int offset, LightingData&, LightSource::PaintingData&,
int lightX, int lightY, float factorX, float factorY, IntPoint& normalVector);
+ void platformApplySoftware() override;
+
inline void platformApply(LightingData&, LightSource::PaintingData&);
inline void platformApplyGenericPaint(LightingData&, LightSource::PaintingData&, int startX, int startY);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -56,10 +56,6 @@
}
}
-void FEMerge::dump()
-{
-}
-
TextStream& FEMerge::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMerge.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEMerge.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMerge.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -30,13 +30,12 @@
public:
static Ref<FEMerge> create(Filter&);
+private:
+ FEMerge(Filter&);
+
void platformApplySoftware() override;
- void dump() override;
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
-private:
- FEMerge(Filter&);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -246,10 +246,6 @@
platformApply(&paintingData);
}
-void FEMorphology::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const MorphologyOperatorType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -46,13 +46,17 @@
float radiusY() const { return m_radiusY; }
bool setRadiusY(float);
+private:
+ FEMorphology(Filter&, MorphologyOperatorType, float radiusX, float radiusY);
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override;
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+ bool platformApplyDegenerate(Uint8ClampedArray* dstPixelArray, const IntRect& imageRect, int radiusX, int radiusY);
+
struct PaintingData {
Uint8ClampedArray* srcPixelArray;
Uint8ClampedArray* dstPixelArray;
@@ -75,10 +79,7 @@
inline void platformApply(PaintingData*);
inline void platformApplyGeneric(PaintingData*, const int yStart, const int yEnd);
-private:
- FEMorphology(Filter&, MorphologyOperatorType, float radiusX, float radiusY);
- bool platformApplyDegenerate(Uint8ClampedArray* dstPixelArray, const IntRect& imageRect, int radiusX, int radiusY);
-
+
MorphologyOperatorType m_type;
float m_radiusX;
float m_radiusY;
Modified: trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -42,21 +42,11 @@
return adoptRef(*new FEOffset(filter, dx, dy));
}
-float FEOffset::dx() const
-{
- return m_dx;
-}
-
void FEOffset::setDx(float dx)
{
m_dx = dx;
}
-float FEOffset::dy() const
-{
- return m_dy;
-}
-
void FEOffset::setDy(float dy)
{
m_dy = dy;
@@ -91,10 +81,6 @@
resultImage->context().drawImageBuffer(*inBuffer, drawingRegion);
}
-void FEOffset::dump()
-{
-}
-
TextStream& FEOffset::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FEOffset.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FEOffset.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FEOffset.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -30,22 +30,21 @@
public:
static Ref<FEOffset> create(Filter&, float dx, float dy);
- float dx() const;
+ float dx() const { return m_dx; }
void setDx(float);
- float dy() const;
+ float dy() const { return m_dy; }
void setDy(float);
+private:
+ FEOffset(Filter&, float dx, float dy);
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override;
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-private:
- FEOffset(Filter&, float dx, float dy);
-
float m_dx;
float m_dy;
};
Modified: trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -39,37 +39,6 @@
FESpecularLighting::~FESpecularLighting() = default;
-const Color& FESpecularLighting::lightingColor() const
-{
- return m_lightingColor;
-}
-
-bool FESpecularLighting::setLightingColor(const Color& lightingColor)
-{
- if (m_lightingColor == lightingColor)
- return false;
- m_lightingColor = lightingColor;
- return true;
-}
-
-float FESpecularLighting::surfaceScale() const
-{
- return m_surfaceScale;
-}
-
-bool FESpecularLighting::setSurfaceScale(float surfaceScale)
-{
- if (m_surfaceScale == surfaceScale)
- return false;
- m_surfaceScale = surfaceScale;
- return true;
-}
-
-float FESpecularLighting::specularConstant() const
-{
- return m_specularConstant;
-}
-
bool FESpecularLighting::setSpecularConstant(float specularConstant)
{
if (m_specularConstant == specularConstant)
@@ -78,11 +47,6 @@
return true;
}
-float FESpecularLighting::specularExponent() const
-{
- return m_specularExponent;
-}
-
bool FESpecularLighting::setSpecularExponent(float specularExponent)
{
if (m_specularExponent == specularExponent)
@@ -91,41 +55,6 @@
return true;
}
-float FESpecularLighting::kernelUnitLengthX() const
-{
- return m_kernelUnitLengthX;
-}
-
-bool FESpecularLighting::setKernelUnitLengthX(float kernelUnitLengthX)
-{
- if (m_kernelUnitLengthX == kernelUnitLengthX)
- return false;
- m_kernelUnitLengthX = kernelUnitLengthX;
- return true;
-}
-
-float FESpecularLighting::kernelUnitLengthY() const
-{
- return m_kernelUnitLengthY;
-}
-
-bool FESpecularLighting::setKernelUnitLengthY(float kernelUnitLengthY)
-{
- if (m_kernelUnitLengthY == kernelUnitLengthY)
- return false;
- m_kernelUnitLengthY = kernelUnitLengthY;
- return true;
-}
-
-const LightSource& FESpecularLighting::lightSource() const
-{
- return m_lightSource.get();
-}
-
-void FESpecularLighting::dump()
-{
-}
-
TextStream& FESpecularLighting::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -30,28 +30,12 @@
static Ref<FESpecularLighting> create(Filter&, const Color&, float, float, float, float, float, Ref<LightSource>&&);
virtual ~FESpecularLighting();
- const Color& lightingColor() const;
- bool setLightingColor(const Color&);
-
- float surfaceScale() const;
- bool setSurfaceScale(float);
-
- float specularConstant() const;
+ float specularConstant() const { return m_specularConstant; }
bool setSpecularConstant(float);
- float specularExponent() const;
+ float specularExponent() const { return m_specularExponent; }
bool setSpecularExponent(float);
- float kernelUnitLengthX() const;
- bool setKernelUnitLengthX(float);
-
- float kernelUnitLengthY() const;
- bool setKernelUnitLengthY(float);
-
- const LightSource& lightSource() const;
-
- void dump() override;
-
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
private:
Modified: trunk/Source/WebCore/platform/graphics/filters/FETile.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -86,10 +86,6 @@
filterContext.fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()));
}
-void FETile::dump()
-{
-}
-
TextStream& FETile::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/FETile.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FETile.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FETile.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -30,17 +30,16 @@
public:
static Ref<FETile> create(Filter&);
+private:
+ FETile(Filter&);
+
+ FilterEffectType filterEffectType() const override { return FilterEffectTypeTile; }
+
void platformApplySoftware() override;
- void dump() override;
void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
- FilterEffectType filterEffectType() const override { return FilterEffectTypeTile; }
-
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
-private:
- FETile(Filter&);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -453,10 +453,6 @@
fillRegion(pixelArray, paintingData, stitchData, 0, height);
}
-void FETurbulence::dump()
-{
-}
-
static TextStream& operator<<(TextStream& ts, const TurbulenceType& type)
{
switch (type) {
Modified: trunk/Source/WebCore/platform/graphics/filters/FETurbulence.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FETurbulence.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FETurbulence.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -58,15 +58,6 @@
bool stitchTiles() const { return m_stitchTiles; }
bool setStitchTiles(bool);
- static void fillRegionWorker(void*);
-
- void platformApplySoftware() override;
- void dump() override;
-
- void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
private:
static const int s_blockSize = 256;
static const int s_blockMask = s_blockSize - 1;
@@ -117,6 +108,10 @@
FETurbulence(Filter&, TurbulenceType, float, float, int, float, bool);
+ void platformApplySoftware() override;
+ void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
void initPaint(PaintingData&);
StitchData computeStitching(IntSize tileSize, float& baseFrequencyX, float& baseFrequencyY) const;
FloatComponents noise2D(const PaintingData&, const StitchData&, const FloatPoint&) const;
@@ -123,6 +118,8 @@
ColorComponents calculateTurbulenceValueForPoint(const PaintingData&, StitchData, const FloatPoint&) const;
void fillRegion(Uint8ClampedArray*, const PaintingData&, StitchData, int startY, int endY) const;
+ static void fillRegionWorker(void*);
+
TurbulenceType m_type;
float m_baseFrequencyX;
float m_baseFrequencyY;
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -110,12 +110,6 @@
// Only the arithmetic composite filter ever needs to perform correction.
virtual void correctFilterResultIfNeeded() { }
- virtual void platformApplySoftware() = 0;
-#if ENABLE(OPENCL)
- virtual bool platformApplyOpenCL();
-#endif
- virtual void dump() = 0;
-
virtual void determineAbsolutePaintRect();
virtual FilterEffectType filterEffectType() const { return FilterEffectTypeUnknown; }
@@ -185,6 +179,8 @@
}
private:
+ virtual void platformApplySoftware() = 0;
+
std::unique_ptr<ImageBuffer> m_imageBufferResult;
RefPtr<Uint8ClampedArray> m_unmultipliedImageResult;
RefPtr<Uint8ClampedArray> m_premultipliedImageResult;
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -63,10 +63,6 @@
filterContext.drawImageBuffer(*imageBuffer, IntPoint(), CompositeDestinationIn);
}
-void SourceAlpha::dump()
-{
-}
-
TextStream& SourceAlpha::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -30,17 +30,13 @@
static const AtomicString& effectName();
+private:
+ explicit SourceAlpha(FilterEffect&);
+ FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
+
void platformApplySoftware() override;
- void dump() override;
-
void determineAbsolutePaintRect() override;
-
- FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
-
WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
-private:
- explicit SourceAlpha(FilterEffect&);
};
} //namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -60,10 +60,6 @@
resultImage->context().drawImageBuffer(*sourceImage, IntPoint());
}
-void SourceGraphic::dump()
-{
-}
-
TextStream& SourceGraphic::externalRepresentation(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.h (225025 => 225026)
--- trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -32,15 +32,6 @@
static const AtomicString& effectName();
- void platformApplySoftware() override;
- void dump() override;
-
- void determineAbsolutePaintRect() override;
-
- FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
-
private:
SourceGraphic(Filter& filter)
: FilterEffect(filter)
@@ -47,6 +38,12 @@
{
setOperatingColorSpace(ColorSpaceSRGB);
}
+
+ void determineAbsolutePaintRect() override;
+ void platformApplySoftware() override;
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
+
+ FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
};
} //namespace WebCore
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp (225025 => 225026)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2017-11-19 01:55:37 UTC (rev 225026)
@@ -137,10 +137,6 @@
resultImage->context().drawImage(*m_image, destRect, srcRect);
}
-void FEImage::dump()
-{
-}
-
TextStream& FEImage::externalRepresentation(TextStream& ts, int indent) const
{
FloatSize imageSize;
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h (225025 => 225026)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h 2017-11-19 01:35:52 UTC (rev 225025)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h 2017-11-19 01:55:37 UTC (rev 225026)
@@ -36,21 +36,18 @@
static Ref<FEImage> createWithImage(Filter&, RefPtr<Image>, const SVGPreserveAspectRatioValue&);
static Ref<FEImage> createWithIRIReference(Filter&, Document&, const String&, const SVGPreserveAspectRatioValue&);
- void platformApplySoftware() final;
- void dump() final;
-
- void determineAbsolutePaintRect() final;
-
- FilterEffectType filterEffectType() const final { return FilterEffectTypeImage; }
-
- WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const final;
-
private:
virtual ~FEImage() = default;
FEImage(Filter&, RefPtr<Image>, const SVGPreserveAspectRatioValue&);
FEImage(Filter&, Document&, const String&, const SVGPreserveAspectRatioValue&);
+ FilterEffectType filterEffectType() const final { return FilterEffectTypeImage; }
+
RenderElement* referencedRenderer() const;
+ void platformApplySoftware() final;
+ void determineAbsolutePaintRect() final;
+ WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const final;
+
RefPtr<Image> m_image;
// m_document will never be a dangling reference. See https://bugs.webkit.org/show_bug.cgi?id=99243
