<!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>[149929] 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/149929">149929</a></dd>
<dt>Author</dt> <dd>robert@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-11 05:08:57 -0700 (Sat, 11 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Text flow broken in elements with vertical align top/bottom and inline elements taller than line-height
https://bugs.webkit.org/show_bug.cgi?id=111974

Source/WebCore:

Reviewed by Ryosuke Niwa.

Per http://www.w3.org/TR/CSS2/visudet.html#propdef-vertical-align 'vertical-align' only applies to inline and table-cell
elements.

Test: fast/css/vertical-align-block-elements.html

* rendering/InlineFlowBox.cpp:
(WebCore::isTextInBlockElement):
(WebCore):
(WebCore::InlineFlowBox::adjustMaxAscentAndDescent):
(WebCore::InlineFlowBox::computeLogicalBoxHeights):
(WebCore::InlineFlowBox::placeBoxesInBlockDirection):

LayoutTests:

Reviewed by Ryosuke Niwa.

* editing/execCommand/query-command-state-expected.txt:
* editing/execCommand/script-tests/query-command-state.js: Remove invalid tests, vertical-align does not apply to
  div elements.
(runTests):
* fast/css/vertical-align-block-elements-expected.html: Added.
* fast/css/vertical-align-block-elements.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandquerycommandstateexpectedtxt">trunk/LayoutTests/editing/execCommand/query-command-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandscripttestsquerycommandstatejs">trunk/LayoutTests/editing/execCommand/script-tests/query-command-state.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssverticalalignblockelementsexpectedhtml">trunk/LayoutTests/fast/css/vertical-align-block-elements-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssverticalalignblockelementshtml">trunk/LayoutTests/fast/css/vertical-align-block-elements.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (149928 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-11 08:36:42 UTC (rev 149928)
+++ trunk/LayoutTests/ChangeLog        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-03-17  Robert Hogan  &lt;robert@webkit.org&gt;
+
+        Text flow broken in elements with vertical align top/bottom and inline elements taller than line-height
+        https://bugs.webkit.org/show_bug.cgi?id=111974
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/execCommand/query-command-state-expected.txt:
+        * editing/execCommand/script-tests/query-command-state.js: Remove invalid tests, vertical-align does not apply to 
+          div elements.
+        (runTests):
+        * fast/css/vertical-align-block-elements-expected.html: Added.
+        * fast/css/vertical-align-block-elements.html: Added.
+
</ins><span class="cx"> 2013-05-10  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;rdar://problem/13666412&gt; Clean up some edge cases of URL parsing.
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandquerycommandstateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/query-command-state-expected.txt (149928 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/query-command-state-expected.txt        2013-05-11 08:36:42 UTC (rev 149928)
+++ trunk/LayoutTests/editing/execCommand/query-command-state-expected.txt        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns true when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt;&quot;
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns false when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt; world&quot;
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns false when selecting all of &quot;hello &lt;sub&gt;world&lt;/sub&gt;&quot;
</span><del>-PASS queryCommandState(&quot;subscript&quot;) returns true when selecting all of &quot;&lt;div style=&quot;vertical-align: sub;&quot;&gt;hello world&lt;/div&gt;&quot;
</del><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns false when selecting second word of &quot;hello &lt;span style=&quot;vertical-align: sub;&quot;&gt;world&lt;/span&gt; WebKit&quot;
</span><span class="cx"> PASS queryCommandState(&quot;superscript&quot;) returns false when selecting all of &quot;hello&quot;
</span><span class="cx"> PASS queryCommandState(&quot;superscript&quot;) returns false when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt;&quot;
</span><span class="lines">@@ -89,7 +88,6 @@
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns true when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt;&quot;
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns true when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt; world&quot;
</span><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns false when selecting all of &quot;hello &lt;sub&gt;world&lt;/sub&gt;&quot;
</span><del>-PASS queryCommandState(&quot;subscript&quot;) returns true when selecting all of &quot;&lt;div style=&quot;vertical-align: sub;&quot;&gt;hello world&lt;/div&gt;&quot;
</del><span class="cx"> PASS queryCommandState(&quot;subscript&quot;) returns true when selecting second word of &quot;hello &lt;span style=&quot;vertical-align: sub;&quot;&gt;world&lt;/span&gt; WebKit&quot;
</span><span class="cx"> PASS queryCommandState(&quot;superscript&quot;) returns false when selecting all of &quot;hello&quot;
</span><span class="cx"> PASS queryCommandState(&quot;superscript&quot;) returns false when selecting all of &quot;&lt;sub&gt;hello&lt;/sub&gt;&quot;
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandscripttestsquerycommandstatejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/script-tests/query-command-state.js (149928 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/script-tests/query-command-state.js        2013-05-11 08:36:42 UTC (rev 149928)
+++ trunk/LayoutTests/editing/execCommand/script-tests/query-command-state.js        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx">     testQueryCommandState(&quot;subscript&quot;, '&lt;sub&gt;hello&lt;/sub&gt;', selectAll, {'mac': true, 'win': true}[editingBehavior]);
</span><span class="cx">     testQueryCommandState(&quot;subscript&quot;, '&lt;sub&gt;hello&lt;/sub&gt; world', selectAll, {'mac': true, 'win': false}[editingBehavior]);
</span><span class="cx">     testQueryCommandState(&quot;subscript&quot;, 'hello &lt;sub&gt;world&lt;/sub&gt;', selectAll, {'mac': false, 'win': false}[editingBehavior]);
</span><del>-    testQueryCommandState(&quot;subscript&quot;, '&lt;div style=&quot;vertical-align: sub;&quot;&gt;hello world&lt;/div&gt;', selectAll, {'mac': true, 'win': true}[editingBehavior]);
</del><span class="cx">     testQueryCommandState(&quot;subscript&quot;, 'hello &lt;span style=&quot;vertical-align: sub;&quot;&gt;world&lt;/span&gt; WebKit', selectSecondWord, {'mac': true, 'win': false}[editingBehavior]);
</span><span class="cx"> 
</span><span class="cx">     testQueryCommandState(&quot;superscript&quot;, 'hello', selectAll, {'mac': false, 'win': false}[editingBehavior]);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssverticalalignblockelementsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/vertical-align-block-elements-expected.html (0 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/vertical-align-block-elements-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/css/vertical-align-block-elements-expected.html        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+    div {
+        line-height: 30px;
+        font-size: 14px;
+    }
+    button {
+        height: 30px;
+    }
+&lt;/style&gt;
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;p&gt;Bug: webkit.org/b/111974 - vertical-align only applies to inline-level elements and table-cells. The text below should be aligned horiontally.
+    &lt;div&gt;
+        &lt;button&gt;All &lt;/button&gt; This &lt;span&gt;text&lt;/span&gt; is &lt;a href=&quot;#&quot;&gt;aligned&lt;/a&gt;.
+    &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css/vertical-align-block-elements-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcssverticalalignblockelementshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/vertical-align-block-elements.html (0 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/vertical-align-block-elements.html                                (rev 0)
+++ trunk/LayoutTests/fast/css/vertical-align-block-elements.html        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+    div {
+        vertical-align: top;
+        line-height: 20px;
+        height: 20px;
+        font-size: 14px;
+    }
+    button {
+        height: 30px;
+    }
+&lt;/style&gt;
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;p&gt;Bug: webkit.org/b/111974 - vertical-align only applies to inline-level elements and table-cells. The text below should be aligned horiontally.
+    &lt;div&gt;
+        &lt;button&gt;All &lt;/button&gt; This &lt;span&gt;text&lt;/span&gt; is &lt;a href=&quot;#&quot;&gt;aligned&lt;/a&gt;.
+    &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css/vertical-align-block-elements.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149928 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-11 08:36:42 UTC (rev 149928)
+++ trunk/Source/WebCore/ChangeLog        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-03-17  Robert Hogan  &lt;robert@webkit.org&gt;
+
+        Text flow broken in elements with vertical align top/bottom and inline elements taller than line-height
+        https://bugs.webkit.org/show_bug.cgi?id=111974
+
+        Reviewed by Ryosuke Niwa.
+        
+        Per http://www.w3.org/TR/CSS2/visudet.html#propdef-vertical-align 'vertical-align' only applies to inline and table-cell
+        elements.
+
+        Test: fast/css/vertical-align-block-elements.html
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::isTextInBlockElement):
+        (WebCore):
+        (WebCore::InlineFlowBox::adjustMaxAscentAndDescent):
+        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
+        (WebCore::InlineFlowBox::placeBoxesInBlockDirection):
+
</ins><span class="cx"> 2013-05-11  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make CanvasStyle a plain object instead of an RefCounted object
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (149928 => 149929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp        2013-05-11 08:36:42 UTC (rev 149928)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp        2013-05-11 12:08:57 UTC (rev 149929)
</span><span class="lines">@@ -480,6 +480,14 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static bool verticalAlignApplies(RenderObject* curr)
+{
+    // The vertical-align property only applies to inline elements and table cells.
+    if (curr-&gt;isRenderBlock() &amp;&amp; !curr-&gt;isInline())
+        printf(&quot;block-flow block\n&quot;);
+    return !curr-&gt;isText() || curr-&gt;parent()-&gt;isInline() || curr-&gt;parent()-&gt;isTableCell();
+}
+
</ins><span class="cx"> void InlineFlowBox::adjustMaxAscentAndDescent(int&amp; maxAscent, int&amp; maxDescent, int maxPositionTop, int maxPositionBottom)
</span><span class="cx"> {
</span><span class="cx">     for (InlineBox* curr = firstChild(); curr; curr = curr-&gt;nextOnLine()) {
</span><span class="lines">@@ -487,7 +495,8 @@
</span><span class="cx">         // positioned elements
</span><span class="cx">         if (curr-&gt;renderer()-&gt;isOutOfFlowPositioned())
</span><span class="cx">             continue; // Positioned placeholders don't affect calculations.
</span><del>-        if (curr-&gt;verticalAlign() == TOP || curr-&gt;verticalAlign() == BOTTOM) {
</del><ins>+
+        if ((curr-&gt;verticalAlign() == TOP || curr-&gt;verticalAlign() == BOTTOM) &amp;&amp; verticalAlignApplies(curr-&gt;renderer())) {
</ins><span class="cx">             int lineHeight = curr-&gt;lineHeight();
</span><span class="cx">             if (curr-&gt;verticalAlign() == TOP) {
</span><span class="cx">                 if (maxAscent + maxDescent &lt; lineHeight)
</span><span class="lines">@@ -570,10 +579,10 @@
</span><span class="cx">         rootBox-&gt;ascentAndDescentForBox(curr, textBoxDataMap, ascent, descent, affectsAscent, affectsDescent);
</span><span class="cx"> 
</span><span class="cx">         LayoutUnit boxHeight = ascent + descent;
</span><del>-        if (curr-&gt;verticalAlign() == TOP) {
</del><ins>+        if (curr-&gt;verticalAlign() == TOP &amp;&amp; verticalAlignApplies(curr-&gt;renderer())) {
</ins><span class="cx">             if (maxPositionTop &lt; boxHeight)
</span><span class="cx">                 maxPositionTop = boxHeight;
</span><del>-        } else if (curr-&gt;verticalAlign() == BOTTOM) {
</del><ins>+        } else if (curr-&gt;verticalAlign() == BOTTOM &amp;&amp; verticalAlignApplies(curr-&gt;renderer())) {
</ins><span class="cx">             if (maxPositionBottom &lt; boxHeight)
</span><span class="cx">                 maxPositionBottom = boxHeight;
</span><span class="cx">         } else if (!inlineFlowBox || strictMode || inlineFlowBox-&gt;hasTextChildren() || (inlineFlowBox-&gt;descendantsHaveSameLineHeightAndBaseline() &amp;&amp; inlineFlowBox-&gt;hasTextDescendants())
</span><span class="lines">@@ -633,9 +642,10 @@
</span><span class="cx"> 
</span><span class="cx">         InlineFlowBox* inlineFlowBox = curr-&gt;isInlineFlowBox() ? toInlineFlowBox(curr) : 0;
</span><span class="cx">         bool childAffectsTopBottomPos = true;
</span><del>-        if (curr-&gt;verticalAlign() == TOP)
</del><ins>+
+        if (curr-&gt;verticalAlign() == TOP &amp;&amp; verticalAlignApplies(curr-&gt;renderer()))
</ins><span class="cx">             curr-&gt;setLogicalTop(top);
</span><del>-        else if (curr-&gt;verticalAlign() == BOTTOM)
</del><ins>+        else if (curr-&gt;verticalAlign() == BOTTOM &amp;&amp; verticalAlignApplies(curr-&gt;renderer()))
</ins><span class="cx">             curr-&gt;setLogicalTop(top + maxHeight - curr-&gt;lineHeight());
</span><span class="cx">         else {
</span><span class="cx">             if (!strictMode &amp;&amp; inlineFlowBox &amp;&amp; !inlineFlowBox-&gt;hasTextChildren() &amp;&amp; !curr-&gt;boxModelObject()-&gt;hasInlineDirectionBordersOrPadding()
</span></span></pre>
</div>
</div>

</body>
</html>