<!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>[162791] 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/162791">162791</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-25 17:27:28 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: RenderInline is not centered when child RenderTextControl's innerTextRenderer needs bias centering.
https://bugs.webkit.org/show_bug.cgi?id=125659
Source/WebCore:
Reviewed by Andreas Kling
layoutMod(logicalHeightDiff, 2) fails to bias round when subpixel layout is enabled. It sets
the denominator value to 2, which returns incorrect modulo result.
(subpixel off: 3px % 2 = 1 vs subpixel on: (3px * 64) -> 192 % 2 = 0)
Covered by existing tests.
* platform/LayoutUnit.h:
* rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::centerContainerIfNeeded):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::centerRenderer):
(WebCore::RenderTextControlSingleLine::layout):
* rendering/RenderTextControlSingleLine.h:
LayoutTests:
Reviewed by Andreas Kling.
layoutMod(logicalHeightDiff, 2) fails to bias round when subpixel layout is enabled. It sets
the denominator value to 2, which returns incorrect modulo result.
(subpixel off: 3px % 2 = 1 vs subpixel on: (3px * 64) -> 192 % 2 = 0)
Covered by existing tests.
* platform/mac/fast/block/float/032-expected.txt:
* platform/mac/fast/forms/search-vertical-alignment-expected.png:
* platform/mac/fast/forms/search-vertical-alignment-expected.txt:
* platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastblockfloat032expectedtxt">trunk/LayoutTests/platform/mac/fast/block/float/032-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedpng">trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlionfastformssearchverticalalignmentexpectedtxt">trunk/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSearchFieldcpp">trunk/Source/WebCore/rendering/RenderSearchField.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLineh">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/LayoutTests/ChangeLog 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: RenderInline is not centered when child RenderTextControl's innerTextRenderer needs bias centering.
+ https://bugs.webkit.org/show_bug.cgi?id=125659
+
+ Reviewed by Andreas Kling.
+
+ layoutMod(logicalHeightDiff, 2) fails to bias round when subpixel layout is enabled. It sets
+ the denominator value to 2, which returns incorrect modulo result.
+ (subpixel off: 3px % 2 = 1 vs subpixel on: (3px * 64) -> 192 % 2 = 0)
+
+ Covered by existing tests.
+
+ * platform/mac/fast/block/float/032-expected.txt:
+ * platform/mac/fast/forms/search-vertical-alignment-expected.png:
+ * platform/mac/fast/forms/search-vertical-alignment-expected.txt:
+ * platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt:
+
</ins><span class="cx"> 2014-01-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r162744): wsj.com paints white
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastblockfloat032expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/block/float/032-expected.txt (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/block/float/032-expected.txt 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/LayoutTests/platform/mac/fast/block/float/032-expected.txt 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx"> RenderTextControl {INPUT} at (55,5) size 106x106 [bgcolor=#800080] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (216,572) size 100x13
</span><del>- RenderBlock {DIV} at (3,46) size 100x14
</del><ins>+ RenderBlock {DIV} at (3,47) size 100x13
</ins><span class="cx"> layer at (316,700) size 100x13
</span><del>- RenderBlock {DIV} at (3,46) size 100x14
</del><ins>+ RenderBlock {DIV} at (3,47) size 100x13
</ins><span class="cx"> layer at (66,828) size 100x13
</span><del>- RenderBlock {DIV} at (3,46) size 100x14
</del><ins>+ RenderBlock {DIV} at (3,47) size 100x13
</ins><span class="cx"> layer at (66,956) size 100x13
</span><del>- RenderBlock {DIV} at (3,46) size 100x14
</del><ins>+ RenderBlock {DIV} at (3,47) size 100x13
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,113) size 784x18
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 176x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- RenderFlexibleBox {DIV} at (3,1) size 170x14
</del><ins>+ RenderFlexibleBox {DIV} at (3,1) size 170x13
</ins><span class="cx"> RenderBlock {DIV} at (0,1) size 17x11
</span><span class="cx"> RenderBlock {DIV} at (17,0) size 140x13
</span><span class="cx"> RenderBlock {DIV} at (156,1) size 14x11
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> RenderBlock {DIV} at (3,16) size 140x13
</span><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><del>-layer at (30,125) size 139x13
</del><ins>+layer at (30,124) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 140x13
</span><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><del>-layer at (196,125) size 139x13
- RenderBlock {DIV} at (3,1) size 140x14
</del><ins>+layer at (196,124) size 139x13
+ RenderBlock {DIV} at (3,1) size 140x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><span class="cx"> layer at (30,160) size 139x6 scrollHeight 13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlionfastformssearchverticalalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,113) size 784x18
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 153x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- RenderFlexibleBox {DIV} at (3,1) size 147x14
</del><ins>+ RenderFlexibleBox {DIV} at (3,1) size 147x13
</ins><span class="cx"> RenderBlock {DIV} at (0,1) size 17x11
</span><span class="cx"> RenderBlock {DIV} at (17,0) size 117x13
</span><span class="cx"> RenderBlock {DIV} at (134,1) size 13x11
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> RenderBlock {DIV} at (3,16) size 117x13
</span><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><del>-layer at (30,125) size 117x13
</del><ins>+layer at (30,124) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 117x13
</span><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><del>-layer at (174,125) size 117x13
- RenderBlock {DIV} at (3,1) size 117x14
</del><ins>+layer at (174,124) size 117x13
+ RenderBlock {DIV} at (3,1) size 117x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 24x13
</span><span class="cx"> text run at (0,0) width 24: "Text"
</span><span class="cx"> layer at (30,160) size 117x6 scrollHeight 13
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/Source/WebCore/ChangeLog 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: RenderInline is not centered when child RenderTextControl's innerTextRenderer needs bias centering.
+ https://bugs.webkit.org/show_bug.cgi?id=125659
+
+ Reviewed by Andreas Kling
+
+ layoutMod(logicalHeightDiff, 2) fails to bias round when subpixel layout is enabled. It sets
+ the denominator value to 2, which returns incorrect modulo result.
+ (subpixel off: 3px % 2 = 1 vs subpixel on: (3px * 64) -> 192 % 2 = 0)
+
+ Covered by existing tests.
+
+ * platform/LayoutUnit.h:
+ * rendering/RenderSearchField.cpp:
+ (WebCore::RenderSearchField::centerContainerIfNeeded):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::centerRenderer):
+ (WebCore::RenderTextControlSingleLine::layout):
+ * rendering/RenderTextControlSingleLine.h:
+
</ins><span class="cx"> 2014-01-25 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove more unnecessary #if PLATFORM(IOS)s in ApplicationCacheStorage.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -958,11 +958,6 @@
</span><span class="cx"> return value.abs();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutUnit layoutMod(const LayoutUnit& numerator, const LayoutUnit& denominator)
-{
- return numerator % denominator;
-}
-
</del><span class="cx"> inline bool isIntegerValue(const LayoutUnit value)
</span><span class="cx"> {
</span><span class="cx"> return value.toInt() == value;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSearchFieldcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSearchField.cpp (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSearchField.cpp 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/Source/WebCore/rendering/RenderSearchField.cpp 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -373,8 +373,7 @@
</span><span class="cx">
</span><span class="cx"> // A quirk for find-in-page box on Safari Windows.
</span><span class="cx"> // http://webkit.org/b/63157
</span><del>- LayoutUnit logicalHeightDiff = containerRenderer->logicalHeight() - contentLogicalHeight();
- containerRenderer->setLogicalTop(containerRenderer->logicalTop() - (logicalHeightDiff / 2 + layoutMod(logicalHeightDiff, 2)));
</del><ins>+ centerRenderer(*containerRenderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -93,6 +93,13 @@
</span><span class="cx"> return containerElement() ? contentLogicalHeight() : logicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderTextControlSingleLine::centerRenderer(RenderBox& renderer) const
+{
+ LayoutUnit logicalHeightDiff = renderer.logicalHeight() - contentLogicalHeight();
+ float center = logicalHeightDiff / 2;
+ renderer.setLogicalTop(renderer.logicalTop() - LayoutUnit(round(center)));
+}
+
</ins><span class="cx"> static void setNeedsLayoutOnAncestors(RenderObject* start, RenderObject* ancestor)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(start != ancestor);
</span><span class="lines">@@ -170,10 +177,9 @@
</span><span class="cx"> RenderBlockFlow::layoutBlock(true);
</span><span class="cx">
</span><span class="cx"> // Center the child block in the block progression direction (vertical centering for horizontal text fields).
</span><del>- if (!container && innerTextRenderer && innerTextRenderer->height() != contentLogicalHeight()) {
- LayoutUnit logicalHeightDiff = innerTextRenderer->logicalHeight() - contentLogicalHeight();
- innerTextRenderer->setLogicalTop(innerTextRenderer->logicalTop() - (logicalHeightDiff / 2 + layoutMod(logicalHeightDiff, 2)));
- } else
</del><ins>+ if (!container && innerTextRenderer && innerTextRenderer->height() != contentLogicalHeight())
+ centerRenderer(*innerTextRenderer);
+ else
</ins><span class="cx"> centerContainerIfNeeded(containerRenderer);
</span><span class="cx">
</span><span class="cx"> // Ignores the paddings for the inner spin button.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (162790 => 162791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2014-01-26 01:08:21 UTC (rev 162790)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2014-01-26 01:27:28 UTC (rev 162791)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> virtual void centerContainerIfNeeded(RenderBox*) const { }
</span><span class="cx"> virtual LayoutUnit computeLogicalHeightLimit() const;
</span><ins>+ void centerRenderer(RenderBox& renderer) const;
</ins><span class="cx"> HTMLElement* containerElement() const;
</span><span class="cx"> HTMLElement* innerBlockElement() const;
</span><span class="cx"> HTMLInputElement& inputElement() const;
</span></span></pre>
</div>
</div>
</body>
</html>