<!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>[162559] 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/162559">162559</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 14:56:17 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] shape-inside rectangle layout can fail
https://bugs.webkit.org/show_bug.cgi?id=124784
Reviewed by Darin Adler.
Early subpixel rounding/flooring/ceiling can have unwanted
side effect on the final pixel value. Delay pixel
conversions as much as possible.
Existing test is changed to reflect subpixel functionality.
Source/WebCore:
* rendering/shapes/RectangleShape.cpp:
(WebCore::RectangleShape::firstIncludedIntervalLogicalTop):
LayoutTests:
* fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsidesubpixelrectangletopexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesRectangleShapecpp">trunk/Source/WebCore/rendering/shapes/RectangleShape.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/LayoutTests/ChangeLog 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-01-22 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ [CSS Shapes] shape-inside rectangle layout can fail
+ https://bugs.webkit.org/show_bug.cgi?id=124784
+
+ Reviewed by Darin Adler.
+
+ Early subpixel rounding/flooring/ceiling can have unwanted
+ side effect on the final pixel value. Delay pixel
+ conversions as much as possible.
+
+ Existing test is changed to reflect subpixel functionality.
+
+ * fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
+2014-01-22 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Subpixel Layout: SimpleLineLayout needs more position rounding to match InlineFlowBox layout.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127404
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsidesubpixelrectangletopexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top-expected.html 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><ins>+<script src="../resources/subpixel-utils.js"></script>
</ins><span class="cx"> <style>
</span><span class="cx"> #shape-inside {
</span><span class="cx"> font: 100px/1 Ahem, sans-serif;
</span><span class="lines">@@ -8,12 +9,19 @@
</span><span class="cx"> color: green;
</span><span class="cx"> background-color: grey;
</span><span class="cx"> width: 200px;
</span><del>- height: 198px;
- padding-top: 2px;
</del><ins>+ height: 198.7px;
+ padding-top: 1.3px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div id="shape-inside">X</div>
</span><ins>+<script>
+ if (!SubPixelLayout.isEnabled()) {
+ var divX = document.getElementById("shape-inside");
+ divX.style.paddingTop = "2px";
+ divX.offsetHeight;
+ }
+</script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -1334,9 +1334,6 @@
</span><span class="cx"> webkit.org/b/126889 fast/forms/input-widths.html [ Failure ]
</span><span class="cx"> webkit.org/b/126889 fast/forms/number/number-size.html [ Failure ]
</span><span class="cx">
</span><del>-# webkit.org/b/124784 needs revisiting.
-webkit.org/b/124784 fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html [ ImageOnlyFailure ]
-
</del><span class="cx"> # Subpixel: off-by-1 pixel rendering on mathml
</span><span class="cx"> webkit.org/b/126897 mathml/presentation/bug95015.html [ ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -2870,9 +2870,6 @@
</span><span class="cx"> webkit.org/b/125855 accessibility/aria-checked-mixed-value.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # Subpixel failures
</span><del>-# webkit.org/b/124784 needs revisiting.
-webkit.org/b/124784 fast/shapes/shape-inside/shape-inside-subpixel-rectangle-top.html [ ImageOnlyFailure ]
-
</del><span class="cx"> # Subpixel: off-by-1 pixel rendering on mathml
</span><span class="cx"> webkit.org/b/126897 mathml/presentation/bug95015.html [ ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-22 Zalan Bujtas <zalan@apple.com>
+
+ [CSS Shapes] shape-inside rectangle layout can fail
+ https://bugs.webkit.org/show_bug.cgi?id=124784
+
+ Reviewed by Darin Adler.
+
+ Early subpixel rounding/flooring/ceiling can have unwanted
+ side effect on the final pixel value. Delay pixel
+ conversions as much as possible.
+
+ Existing test is changed to reflect subpixel functionality.
+
+ * rendering/shapes/RectangleShape.cpp:
+ (WebCore::RectangleShape::firstIncludedIntervalLogicalTop):
+
</ins><span class="cx"> 2014-01-22 Jochen Eisinger <jochen@chromium.org>
</span><span class="cx">
</span><span class="cx"> Add protocolIsInHTTPFamily for strings and use it where appropriate
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRectangleShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RectangleShape.cpp (162558 => 162559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RectangleShape.cpp 2014-01-22 22:38:53 UTC (rev 162558)
+++ trunk/Source/WebCore/rendering/shapes/RectangleShape.cpp 2014-01-22 22:56:17 UTC (rev 162559)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> if (bounds.isEmpty() || minIntervalWidth > bounds.width())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- float minY = LayoutUnit::fromFloatCeil(std::max(bounds.y(), minIntervalTop));
</del><ins>+ float minY = std::max(bounds.y(), minIntervalTop);
</ins><span class="cx"> float maxY = minY + minIntervalHeight;
</span><span class="cx">
</span><span class="cx"> if (maxY > bounds.maxY())
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> bool intervalOverlapsMaxCorner = maxY > bounds.maxY() - paddingRadiusY;
</span><span class="cx">
</span><span class="cx"> if (!intervalOverlapsMinCorner && !intervalOverlapsMaxCorner) {
</span><del>- result = minY;
</del><ins>+ result = ceiledLayoutUnit(minY);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,18 +197,18 @@
</span><span class="cx">
</span><span class="cx"> if (intervalOverlapsMinCorner && (!intervalOverlapsMaxCorner || minCornerDefinesX)) {
</span><span class="cx"> if (intervalFitsWithinCorners || bounds.y() + cornerIntercept.y() < minY) {
</span><del>- result = minY;
</del><ins>+ result = ceiledLayoutUnit(minY);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> if (minIntervalHeight < bounds.height() - (2 * cornerIntercept.y())) {
</span><del>- result = LayoutUnit::fromFloatCeil(bounds.y() + cornerIntercept.y());
</del><ins>+ result = ceiledLayoutUnit(bounds.y() + cornerIntercept.y());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (intervalOverlapsMaxCorner && (!intervalOverlapsMinCorner || !minCornerDefinesX)) {
</span><span class="cx"> if (intervalFitsWithinCorners || minY <= bounds.maxY() - cornerIntercept.y() - minIntervalHeight) {
</span><del>- result = minY;
</del><ins>+ result = ceiledLayoutUnit(minY);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>