<!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>[180407] branches/safari-600.1.4.15-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/180407">180407</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 02:57:17 -0800 (Fri, 20 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/180147">r180147</a>. rdar://problem/19871065</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180406 => 180407)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-02-20 10:10:34 UTC (rev 180406)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-02-20 10:57:17 UTC (rev 180407)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-02-20  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r180147
+
+    2015-02-16  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+            FEGaussianBlur::calculateUnscaledKernelSize does unspeakable things with signed and unsigned values
+            https://bugs.webkit.org/show_bug.cgi?id=141596
+            &lt;rdar://problem/19837103&gt;
+
+            Reviewed by Zalan Bujtas.
+
+            No new tests. Covered by css3/filters/huge-blur-value.html
+
+            Avoid overflowing the signed integer values by not converting from unsigned
+            until the maximum size has been clamped to the expected max.
+
+            * platform/graphics/filters/FEGaussianBlur.cpp:
+            (WebCore::FEGaussianBlur::calculateUnscaledKernelSize):
+
+2015-02-20  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
</ins><span class="cx">         Merge r180191.
</span><span class="cx"> 
</span><span class="cx">     2015-02-16  Enrica Casucci  &lt;enrica@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsfiltersFEGaussianBlurcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (180406 => 180407)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp        2015-02-20 10:10:34 UTC (rev 180406)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp        2015-02-20 10:57:17 UTC (rev 180407)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">  * Copyright (C) 2009 Dirk Schulze &lt;krit@webkit.org&gt;
</span><span class="cx">  * Copyright (C) 2010 Igalia, S.L.
</span><span class="cx">  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple, Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * This library is free software; you can redistribute it and/or
</span><span class="cx">  * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -468,22 +469,24 @@
</span><span class="cx">     platformApplyGeneric(srcPixelArray, tmpPixelArray, kernelSizeX, kernelSizeY, paintSize);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static int clampedToKernelSize(float value)
+{
+    // Limit the kernel size to 500. A bigger radius won't make a big difference for the result image but
+    // inflates the absolute paint rect too much. This is compatible with Firefox' behavior.
+    unsigned size = std::max&lt;unsigned&gt;(2, static_cast&lt;unsigned&gt;(floorf(value * gaussianKernelFactor() + 0.5f)));
+    return clampTo&lt;int&gt;(std::min(size, static_cast&lt;unsigned&gt;(gMaxKernelSize)));
+}
+    
</ins><span class="cx"> IntSize FEGaussianBlur::calculateUnscaledKernelSize(const FloatPoint&amp; stdDeviation)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(stdDeviation.x() &gt;= 0 &amp;&amp; stdDeviation.y() &gt;= 0);
</span><span class="cx">     IntSize kernelSize;
</span><span class="cx"> 
</span><del>-    // Limit the kernel size to 500. A bigger radius won't make a big difference for the result image but
-    // inflates the absolute paint rect too much. This is compatible with Firefox' behavior.
-    if (stdDeviation.x()) {
-        int size = std::max&lt;unsigned&gt;(2, static_cast&lt;unsigned&gt;(floorf(stdDeviation.x() * gaussianKernelFactor() + 0.5f)));
-        kernelSize.setWidth(std::min(size, gMaxKernelSize));
-    }
</del><ins>+    if (stdDeviation.x())
+        kernelSize.setWidth(clampedToKernelSize(stdDeviation.x()));
</ins><span class="cx"> 
</span><del>-    if (stdDeviation.y()) {
-        int size = std::max&lt;unsigned&gt;(2, static_cast&lt;unsigned&gt;(floorf(stdDeviation.y() * gaussianKernelFactor() + 0.5f)));
-        kernelSize.setHeight(std::min(size, gMaxKernelSize));
-    }
</del><ins>+    if (stdDeviation.y())
+        kernelSize.setHeight(clampedToKernelSize(stdDeviation.y()));
</ins><span class="cx"> 
</span><span class="cx">     return kernelSize;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>