<!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>[188271] trunk</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/188271">188271</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-11 12:27:12 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>feMorphology is not rendered correctly on Retina display
https://bugs.webkit.org/show_bug.cgi?id=147589
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-08-11
Reviewed by Dean Jackson.
Source/WebCore:
The result ImageBuffer of any FilterEffect is already scaled up for 2x
display. The FEMorphology needs to fix its painting data dimension and
radius by multiplying them by the filter scale factor.
Test: fast/hidpi/filters-morphology.html
* platform/graphics/filters/FEMorphology.cpp:
(WebCore::FEMorphology::platformApplySoftware):
LayoutTests:
Ensure we take the filter scale factor into consideration when applying
the FEMorphology.
* fast/hidpi/filters-morphology-expected.html: Added.
* fast/hidpi/filters-morphology.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEMorphologycpp">trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthidpifiltersmorphologyexpectedhtml">trunk/LayoutTests/fast/hidpi/filters-morphology-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpifiltersmorphologyhtml">trunk/LayoutTests/fast/hidpi/filters-morphology.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188270 => 188271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-11 19:15:43 UTC (rev 188270)
+++ trunk/LayoutTests/ChangeLog 2015-08-11 19:27:12 UTC (rev 188271)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-11 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ feMorphology is not rendered correctly on Retina display
+ https://bugs.webkit.org/show_bug.cgi?id=147589
+
+ Reviewed by Dean Jackson.
+
+ Ensure we take the filter scale factor into consideration when applying
+ the FEMorphology.
+
+ * fast/hidpi/filters-morphology-expected.html: Added.
+ * fast/hidpi/filters-morphology.html: Added.
+
</ins><span class="cx"> 2015-08-11 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Numeric setter on prototype doesn't get called.
</span></span></pre></div>
<a id="trunkLayoutTestsfasthidpifiltersmorphologyexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/filters-morphology-expected.html (0 => 188271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/filters-morphology-expected.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/filters-morphology-expected.html 2015-08-11 19:27:12 UTC (rev 188271)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="resources/ensure-hidpi.js"></script>
+ <style>
+ div {
+ width: 120px;
+ height: 120px;
+ margin: 10px 10px 10px 10px;
+ border: none;
+ display: inline-block;
+ background-color: lime;
+ }
+ </style>
+</head>
+<body>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpifiltersmorphologyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/filters-morphology.html (0 => 188271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/filters-morphology.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/filters-morphology.html 2015-08-11 19:27:12 UTC (rev 188271)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="resources/ensure-hidpi.js"></script>
+ <style>
+ div {
+ width: 100px;
+ height: 100px;
+ margin: 20px 20px 20px 16px;
+ border: none;
+ display: inline-block;
+ background-color: lime;
+ }
+ </style>
+</head>
+<body>
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="0" height="0">
+ <defs>
+ <filter id="filter" primitiveUnits="userSpaceOnUse">
+ <feMorphology in="SourceGraphic" operator="dilate" radius="10"/>
+ </filter>
+ </defs>
+ </svg>
+ <div style="-webkit-filter: url('#filter'); filter: url('#filter');"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188270 => 188271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-11 19:15:43 UTC (rev 188270)
+++ trunk/Source/WebCore/ChangeLog 2015-08-11 19:27:12 UTC (rev 188271)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-11 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ feMorphology is not rendered correctly on Retina display
+ https://bugs.webkit.org/show_bug.cgi?id=147589
+
+ Reviewed by Dean Jackson.
+
+ The result ImageBuffer of any FilterEffect is already scaled up for 2x
+ display. The FEMorphology needs to fix its painting data dimension and
+ radius by multiplying them by the filter scale factor.
+
+ Test: fast/hidpi/filters-morphology.html
+
+ * platform/graphics/filters/FEMorphology.cpp:
+ (WebCore::FEMorphology::platformApplySoftware):
+
</ins><span class="cx"> 2015-08-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Arabic letter Yeh is drawn in LastResort
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEMorphologycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (188270 => 188271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2015-08-11 19:15:43 UTC (rev 188270)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2015-08-11 19:27:12 UTC (rev 188271)
</span><span class="lines">@@ -238,10 +238,10 @@
</span><span class="cx"> PaintingData paintingData;
</span><span class="cx"> paintingData.srcPixelArray = srcPixelArray.get();
</span><span class="cx"> paintingData.dstPixelArray = dstPixelArray;
</span><del>- paintingData.width = effectDrawingRect.width();
- paintingData.height = effectDrawingRect.height();
- paintingData.radiusX = radiusX;
- paintingData.radiusY = radiusY;
</del><ins>+ paintingData.width = ceilf(effectDrawingRect.width() * filter.filterScale());
+ paintingData.height = ceilf(effectDrawingRect.height() * filter.filterScale());
+ paintingData.radiusX = ceilf(radiusX * filter.filterScale());
+ paintingData.radiusY = ceilf(radiusY * filter.filterScale());
</ins><span class="cx">
</span><span class="cx"> platformApply(&paintingData);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>