Modified: trunk/Source/WebCore/ChangeLog (124212 => 124213)
--- trunk/Source/WebCore/ChangeLog 2012-07-31 16:08:56 UTC (rev 124212)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 16:10:39 UTC (rev 124213)
@@ -1,3 +1,18 @@
+2012-07-31 Stephen White <senorbla...@chromium.org>
+
+ Remove the clone() method from FilterOperation (and subclasses).
+ https://bugs.webkit.org/show_bug.cgi?id=92757
+
+ Reviewed by Kentaro Hara.
+
+ Since the move to WebFilterOperation in Chromium, this is now dead
+ code.
+
+ Covered by existing tests in css3/filters.
+
+ * platform/graphics/filters/CustomFilterOperation.h:
+ * platform/graphics/filters/FilterOperation.h:
+
2012-07-31 Thiago Marcos P. Santos <thiago.san...@intel.com>
Regression(r124135): SVG tests crashing on ports using Cairo
Modified: trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h (124212 => 124213)
--- trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h 2012-07-31 16:08:56 UTC (rev 124212)
+++ trunk/Source/WebCore/platform/graphics/filters/CustomFilterOperation.h 2012-07-31 16:10:39 UTC (rev 124213)
@@ -65,13 +65,6 @@
return adoptRef(new CustomFilterOperation(program, sortedParameters, meshRows, meshColumns, meshBoxType, meshType));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- // Some member vars (e.g., m_program) are not thread-safe, so
- // we can't be cloned.
- return 0;
- }
-
CustomFilterProgram* program() const { return m_program.get(); }
const CustomFilterParameterList& parameters() { return m_parameters; }
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (124212 => 124213)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2012-07-31 16:08:56 UTC (rev 124212)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2012-07-31 16:10:39 UTC (rev 124213)
@@ -82,8 +82,6 @@
// True if the the value of one pixel can affect the value of another pixel under this operation, such as blur.
virtual bool movesPixels() const { return false; }
- virtual PassRefPtr<FilterOperation> clone() const = 0;
-
protected:
FilterOperation(OperationType type)
: m_type(type)
@@ -100,11 +98,6 @@
return adoptRef(new DefaultFilterOperation(type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new DefaultFilterOperation(m_type));
- }
-
private:
virtual bool operator==(const FilterOperation& o) const
@@ -127,11 +120,6 @@
return adoptRef(new PassthroughFilterOperation());
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new PassthroughFilterOperation());
- }
-
private:
virtual bool operator==(const FilterOperation& o) const
@@ -152,12 +140,6 @@
return adoptRef(new ReferenceFilterOperation(url, fragment, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- // Unimplemented
- return 0;
- }
-
virtual bool affectsOpacity() const { return true; }
virtual bool movesPixels() const { return true; }
@@ -199,11 +181,6 @@
return adoptRef(new BasicColorMatrixFilterOperation(amount, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new BasicColorMatrixFilterOperation(m_amount, m_type));
- }
-
double amount() const { return m_amount; }
virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, bool blendToPassthrough = false);
@@ -236,11 +213,6 @@
return adoptRef(new BasicComponentTransferFilterOperation(amount, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new BasicComponentTransferFilterOperation(m_amount, m_type));
- }
-
double amount() const { return m_amount; }
virtual bool affectsOpacity() const { return m_type == OPACITY; }
@@ -274,11 +246,6 @@
return adoptRef(new GammaFilterOperation(amplitude, exponent, offset, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new GammaFilterOperation(m_amplitude, m_exponent, m_offset, m_type));
- }
-
double amplitude() const { return m_amplitude; }
double exponent() const { return m_exponent; }
double offset() const { return m_offset; }
@@ -314,11 +281,6 @@
return adoptRef(new BlurFilterOperation(stdDeviation, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new BlurFilterOperation(m_stdDeviation, m_type));
- }
-
Length stdDeviation() const { return m_stdDeviation; }
virtual bool affectsOpacity() const { return true; }
@@ -351,11 +313,6 @@
return adoptRef(new DropShadowFilterOperation(location, stdDeviation, color, type));
}
- virtual PassRefPtr<FilterOperation> clone() const
- {
- return adoptRef(new DropShadowFilterOperation(m_location, m_stdDeviation, m_color, m_type));
- }
-
int x() const { return m_location.x(); }
int y() const { return m_location.y(); }
IntPoint location() const { return m_location; }
