<!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>[176185] releases/WebKitGTK/webkit-2.6</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/176185">176185</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-17 00:20:11 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176082">r176082</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/172826">r172826</a>): Password field placeholder text is missing if
placeholder attribute precedes type attribute
<https://bugs.webkit.org/show_bug.cgi?id=138682>
<rdar://problem/18574213>
Source/WebCore:
When the placeholder attribute is encountered, a shadow tree is created
to include the placeholder element. When the type attribute is
encountered, the previous shadow tree is destroyed, and a new shadow
tree is created. TextFieldInputType::createShadowSubtree() did not
handle creating the placeholder element.
This regressed in <a href="http://trac.webkit.org/projects/webkit/changeset/172826">r172826</a> because prior to <a href="http://trac.webkit.org/projects/webkit/changeset/172826">r172826</a>, the placeholder
element would be recreated when
HTMLTextFormControlElement::updatePlaceholderVisibility() was called.
In <a href="http://trac.webkit.org/projects/webkit/changeset/172826">r172826</a>, updatePlaceholderVisibility() was changed to only show or
hide the placeholder element if it exists.
Reviewed by Benjamin Poulain.
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::createShadowSubtree):
Call updatePlaceholderVisibility() to insert the placeholder element
(after the inner text element has been inserted, as it appears before
it in the shadow DOM).
LayoutTests:
Reviewed by Benjamin Poulain.
* fast/forms/placeholder-attribute-ordering-expected.html: Added.
* fast/forms/placeholder-attribute-ordering.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorehtmlTextFieldInputTypecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/html/TextFieldInputType.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastformsplaceholderattributeorderingexpectedhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastformsplaceholderattributeorderinghtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (176184 => 176185)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-17 08:18:34 UTC (rev 176184)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-17 08:20:11 UTC (rev 176185)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-11-12 Jon Honeycutt <jhoneycutt@apple.com>
+
+ REGRESSION (r172826): Password field placeholder text is missing if
+ placeholder attribute precedes type attribute
+
+ <https://bugs.webkit.org/show_bug.cgi?id=138682>
+ <rdar://problem/18574213>
+
+ Reviewed by Benjamin Poulain.
+
+ * fast/forms/placeholder-attribute-ordering-expected.html: Added.
+ * fast/forms/placeholder-attribute-ordering.html: Added.
+
</ins><span class="cx"> 2014-11-11 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [Frame Flattening] ASSERT(transaction->view == &view()) fails in RenderBlock::removeFromUpdateScrollInfoAfterLayoutTransaction()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastformsplaceholderattributeorderingexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering-expected.html (0 => 176185)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering-expected.html 2014-11-17 08:20:11 UTC (rev 176185)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>This test ensures that placeholder text is shown regardless of the 'type' and 'placeholder' attribute order.</p>
+ <div>
+ <input type="text" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ </div>
+ <div>
+ <input type="password" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ </div>
+ <div>
+ <input type="number" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ <input type="text" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ </div>
+ <div>
+ <input type="text" placeholder="12334567890">
+ <input type="password" placeholder="12334567890">
+ <input type="number" placeholder="12334567890">
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastformsplaceholderattributeorderinghtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering.html (0 => 176185)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/forms/placeholder-attribute-ordering.html 2014-11-17 08:20:11 UTC (rev 176185)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>This test ensures that placeholder text is shown regardless of the 'type' and 'placeholder' attribute order.</p>
+ <div>
+ <input type="text" placeholder="12334567890">
+ <input placeholder="12334567890" type="text">
+ <input type="text" id="a" placeholder="12334567890">
+ <input type="text" id="b" placeholder="NA">
+ <input type="text" id="c">
+ <input type="text" id="d">
+ <input id="e">
+ </div>
+ <div>
+ <input type="password" placeholder="12334567890">
+ <input placeholder="12334567890" type="password">
+ <input type="password" id="f" placeholder="12334567890">
+ <input type="password" id="g" placeholder="NA">
+ <input type="password" id="h">
+ <input type="password" id="i">
+ <input id="j">
+ </div>
+ <div>
+ <input type="number" placeholder="12334567890">
+ <input placeholder="12334567890" type="number">
+ <input type="number" id="k" placeholder="12334567890">
+ <input type="number" id="l" placeholder="456">
+ <input type="number" id="m">
+ <input type="number" id="n">
+ <input id="o">
+ </div>
+ <div>
+ <input id="p">
+ <input id="q">
+ <input id="r">
+ </div>
+ <script>
+ for (var id of ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"])
+ document.getElementById(id).placeholder = "12334567890";
+
+ document.getElementById("c").type = "password";
+ document.getElementById("d").type = "number";
+ document.getElementById("e").type = "text";
+
+ document.getElementById("h").type = "text";
+ document.getElementById("i").type = "number";
+ document.getElementById("j").type = "password";
+
+ document.getElementById("m").type = "text";
+ document.getElementById("n").type = "password";
+ document.getElementById("o").type = "number";
+
+ document.getElementById("p").type = "text";
+ document.getElementById("q").type = "password";
+ document.getElementById("r").type = "number";
+ for (var id of ["p", "q", "r"])
+ document.getElementById(id).placeholder = "12334567890";
+ </script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (176184 => 176185)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-17 08:18:34 UTC (rev 176184)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-17 08:20:11 UTC (rev 176185)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-11-12 Jon Honeycutt <jhoneycutt@apple.com>
+
+ REGRESSION (r172826): Password field placeholder text is missing if
+ placeholder attribute precedes type attribute
+
+ <https://bugs.webkit.org/show_bug.cgi?id=138682>
+ <rdar://problem/18574213>
+
+ When the placeholder attribute is encountered, a shadow tree is created
+ to include the placeholder element. When the type attribute is
+ encountered, the previous shadow tree is destroyed, and a new shadow
+ tree is created. TextFieldInputType::createShadowSubtree() did not
+ handle creating the placeholder element.
+
+ This regressed in r172826 because prior to r172826, the placeholder
+ element would be recreated when
+ HTMLTextFormControlElement::updatePlaceholderVisibility() was called.
+ In r172826, updatePlaceholderVisibility() was changed to only show or
+ hide the placeholder element if it exists.
+
+ Reviewed by Benjamin Poulain.
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::createShadowSubtree):
+ Call updatePlaceholderVisibility() to insert the placeholder element
+ (after the inner text element has been inserted, as it appears before
+ it in the shadow DOM).
+
</ins><span class="cx"> 2014-11-11 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [Frame Flattening] ASSERT(transaction->view == &view()) fails in RenderBlock::removeFromUpdateScrollInfoAfterLayoutTransaction()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/TextFieldInputType.cpp (176184 => 176185)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/TextFieldInputType.cpp 2014-11-17 08:18:34 UTC (rev 176184)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/TextFieldInputType.cpp 2014-11-17 08:20:11 UTC (rev 176185)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> m_innerText = TextControlInnerTextElement::create(document);
</span><span class="cx"> if (!createsContainer) {
</span><span class="cx"> element().userAgentShadowRoot()->appendChild(m_innerText, IGNORE_EXCEPTION);
</span><ins>+ updatePlaceholderText();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -253,6 +254,8 @@
</span><span class="cx"> m_innerBlock->appendChild(m_innerText, IGNORE_EXCEPTION);
</span><span class="cx"> m_container->appendChild(m_innerBlock, IGNORE_EXCEPTION);
</span><span class="cx">
</span><ins>+ updatePlaceholderText();
+
</ins><span class="cx"> if (shouldHaveSpinButton) {
</span><span class="cx"> m_innerSpinButton = SpinButtonElement::create(document, *this);
</span><span class="cx"> m_container->appendChild(m_innerSpinButton, IGNORE_EXCEPTION);
</span></span></pre>
</div>
</div>
</body>
</html>