<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169205] branches/safari-537.77-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169205">169205</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 10:00:31 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/157816">r157816</a>. <rdar://problem/16975484></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationcpp">branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationh">branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169204 => 169205)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-05-22 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r157816
+
+ 2013-10-22 Tim Horton <timothy_horton@apple.com>
+
+ 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 <lforschler@apple.com>
+
</ins><span class="cx"> Merge r155315
</span><span class="cx">
</span><span class="cx"> 2013-09-08 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (169204 => 169205)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -112,27 +112,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> PassRefPtr<FilterOperation> BlurFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)
</span><span class="cx"> {
</span><span class="cx"> if (from && !from->isSameType(*this))
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/platform/graphics/filters/FilterOperation.h (169204 => 169205)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -268,41 +268,6 @@
</span><span class="cx"> double m_amount;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-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;
-};
-
</del><span class="cx"> class BlurFilterOperation : public FilterOperation {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<BlurFilterOperation> create(Length stdDeviation, OperationType type)
</span></span></pre>
</div>
</div>
</body>
</html>