Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169204 => 169205)
--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 16:50:09 UTC (rev 169204)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 17:00:31 UTC (rev 169205)
@@ -1,5 +1,20 @@
2014-05-22 Lucas Forschler <[email protected]>
+ Merge r157816
+
+ 2013-10-22 Tim Horton <[email protected]>
+
+ GammaFilterOperation seems to be dead code
+ https://bugs.webkit.org/show_bug.cgi?id=123173
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/filters/FilterOperation.cpp:
+ * platform/graphics/filters/FilterOperation.h:
+ Remove dead code.
+
+2014-05-22 Lucas Forschler <[email protected]>
+
Merge r155315
2013-09-08 Andreas Kling <[email protected]>
Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (169204 => 169205)
--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-05-22 16:50:09 UTC (rev 169204)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-05-22 17:00:31 UTC (rev 169205)
@@ -112,27 +112,6 @@
}
}
-PassRefPtr<FilterOperation> GammaFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)
-{
- if (from && !from->isSameType(*this))
- return this;
-
- if (blendToPassthrough)
- return GammaFilterOperation::create(
- WebCore::blend(m_amplitude, 1.0, progress),
- WebCore::blend(m_exponent, 1.0, progress),
- WebCore::blend(m_offset, 0.0, progress), m_type);
-
- const GammaFilterOperation* fromOp = static_cast<const GammaFilterOperation*>(from);
- double fromAmplitude = fromOp ? fromOp->amplitude() : 1;
- double fromExponent = fromOp ? fromOp->exponent() : 1;
- double fromOffset = fromOp ? fromOp->offset() : 0;
- return GammaFilterOperation::create(
- WebCore::blend(fromAmplitude, m_amplitude, progress),
- WebCore::blend(fromExponent, m_exponent, progress),
- WebCore::blend(fromOffset, m_offset, progress), m_type);
-}
-
PassRefPtr<FilterOperation> BlurFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)
{
if (from && !from->isSameType(*this))
Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h (169204 => 169205)
--- branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-05-22 16:50:09 UTC (rev 169204)
+++ branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-05-22 17:00:31 UTC (rev 169205)
@@ -268,41 +268,6 @@
double m_amount;
};
-class GammaFilterOperation : public FilterOperation {
-public:
- static PassRefPtr<GammaFilterOperation> create(double amplitude, double exponent, double offset, OperationType type)
- {
- return adoptRef(new GammaFilterOperation(amplitude, exponent, offset, type));
- }
-
- double amplitude() const { return m_amplitude; }
- double exponent() const { return m_exponent; }
- double offset() const { return m_offset; }
-
- virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress, bool blendToPassthrough = false);
-
-private:
- virtual bool operator==(const FilterOperation& o) const
- {
- if (!isSameType(o))
- return false;
- const GammaFilterOperation* other = static_cast<const GammaFilterOperation*>(&o);
- return m_amplitude == other->m_amplitude && m_exponent == other->m_exponent && m_offset == other->m_offset;
- }
-
- GammaFilterOperation(double amplitude, double exponent, double offset, OperationType type)
- : FilterOperation(type)
- , m_amplitude(amplitude)
- , m_exponent(exponent)
- , m_offset(offset)
- {
- }
-
- double m_amplitude;
- double m_exponent;
- double m_offset;
-};
-
class BlurFilterOperation : public FilterOperation {
public:
static PassRefPtr<BlurFilterOperation> create(Length stdDeviation, OperationType type)
