<!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>[37488] 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/37488">37488</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2008-10-10 13:27:51 -0700 (Fri, 10 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Fixes a regression with input search fields, where the placeholder text
        would not be updated when the value of the placeholder attribute changed.

        https://bugs.webkit.org/show_bug.cgi?id=21521

        Reviewed by Adele Peterson.

        Test: fast/forms/search-placeholder-value-changed.html

        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::parseMappedAttribute): Pass true for the
        placeholderValueChanged parameter of updatePlaceholderVisibility.
        (WebCore::HTMLInputElement::updatePlaceholderVisibility): Add parameter
        for placeholderValueChanged that informs the method that the value changed.
        * html/HTMLInputElement.h: Add the placeholderValueChanged to the
        updatePlaceholderVisibility method. Made it default to false.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlHTMLInputElementcpp">trunk/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLInputElementh">trunk/WebCore/html/HTMLInputElement.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformssearchplaceholdervaluechangedhtml">trunk/LayoutTests/fast/forms/search-placeholder-value-changed.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchplaceholdervaluechangedexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-placeholder-value-changed-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (37487 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-10-10 20:12:14 UTC (rev 37487)
+++ trunk/LayoutTests/ChangeLog        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2008-10-10  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+        Layout test for placeholder attribute changed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21521.
+
+        Reviewed by Adele Peterson.
+
+        * fast/forms/search-placeholder-value-changed.html: Added.
+        * platform/mac/fast/forms/search-placeholder-value-changed-expected.txt: Added.
+
</ins><span class="cx"> 2008-10-10  Chris Marrin  &lt;cmarrin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssearchplaceholdervaluechangedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/search-placeholder-value-changed.html (0 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search-placeholder-value-changed.html                                (rev 0)
+++ trunk/LayoutTests/fast/forms/search-placeholder-value-changed.html        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;input type=&quot;search&quot; placeholder=&quot;Test FAILED!&quot; id=&quot;test&quot;&gt;
+&lt;script&gt;
+function delayedTest()
+{
+    var searchField = document.getElementById(&quot;test&quot;);
+    searchField.setAttribute(&quot;placeholder&quot;, &quot;Test Passed&quot;);
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+setTimeout(delayedTest, 100);
+
+if (window.layoutTestController)
+    layoutTestController.waitUntilDone();
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchplaceholdervaluechangedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/forms/search-placeholder-value-changed-expected.txt (0 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-placeholder-value-changed-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-placeholder-value-changed-expected.txt        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderTextControl {INPUT} at (2,2) size 148x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 142x13
+          RenderBlock {DIV} at (0,0) size 8x11
+          RenderBlock {DIV} at (129,0) size 13x11
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (21,13) size 121x13
+  RenderBlock {DIV} at (8,0) size 121x13 [color=#A9A9A9]
+    RenderText {#text} at (1,0) size 63x13
+      text run at (1,0) width 63: &quot;Test Passed&quot;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37487 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-10 20:12:14 UTC (rev 37487)
+++ trunk/WebCore/ChangeLog        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2008-10-10  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
+        Fixes a regression with input search fields, where the placeholder text
+        would not be updated when the value of the placeholder attribute changed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21521
+
+        Reviewed by Adele Peterson.
+
+        Test: fast/forms/search-placeholder-value-changed.html
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::parseMappedAttribute): Pass true for the
+        placeholderValueChanged parameter of updatePlaceholderVisibility.
+        (WebCore::HTMLInputElement::updatePlaceholderVisibility): Add parameter
+        for placeholderValueChanged that informs the method that the value changed.
+        * html/HTMLInputElement.h: Add the placeholderValueChanged to the
+        updatePlaceholderVisibility method. Made it default to false.
+
</ins><span class="cx"> 2008-10-10  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Allow the track part to have negative margins so that it can slightly overlap buttons.  This
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLInputElement.cpp (37487 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLInputElement.cpp        2008-10-10 20:12:14 UTC (rev 37487)
+++ trunk/WebCore/html/HTMLInputElement.cpp        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx">         }
</span><span class="cx">         setChanged();
</span><span class="cx">     } else if (attr-&gt;name() == placeholderAttr)
</span><del>-        updatePlaceholderVisibility();
</del><ins>+        updatePlaceholderVisibility(true);
</ins><span class="cx">     else if (attr-&gt;name() == autosaveAttr ||
</span><span class="cx">                attr-&gt;name() == incrementalAttr ||
</span><span class="cx">                attr-&gt;name() == minAttr ||
</span><span class="lines">@@ -1560,17 +1560,17 @@
</span><span class="cx">         document()-&gt;unregisterForDocumentActivationCallbacks(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLInputElement::updatePlaceholderVisibility()
</del><ins>+void HTMLInputElement::updatePlaceholderVisibility(bool placeholderValueChanged)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isTextField());
</span><span class="cx"> 
</span><span class="cx">     bool oldPlaceholderShouldBeVisible = m_placeholderShouldBeVisible;
</span><del>-    
</del><ins>+
</ins><span class="cx">     m_placeholderShouldBeVisible = value().isEmpty() 
</span><span class="cx">         &amp;&amp; document()-&gt;focusedNode() != this
</span><span class="cx">         &amp;&amp; !getAttribute(placeholderAttr).isEmpty();
</span><span class="cx"> 
</span><del>-    if (oldPlaceholderShouldBeVisible != m_placeholderShouldBeVisible &amp;&amp; renderer())
</del><ins>+    if ((oldPlaceholderShouldBeVisible != m_placeholderShouldBeVisible || placeholderValueChanged) &amp;&amp; renderer())
</ins><span class="cx">         static_cast&lt;RenderTextControl*&gt;(renderer())-&gt;updatePlaceholderVisibility();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLInputElement.h (37487 => 37488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLInputElement.h        2008-10-10 20:12:14 UTC (rev 37487)
+++ trunk/WebCore/html/HTMLInputElement.h        2008-10-10 20:27:51 UTC (rev 37488)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">     void registerForActivationCallbackIfNeeded();
</span><span class="cx">     void unregisterForActivationCallbackIfNeeded();
</span><span class="cx"> 
</span><del>-    void updatePlaceholderVisibility();
</del><ins>+    void updatePlaceholderVisibility(bool placeholderValueChanged = false);
</ins><span class="cx">     
</span><span class="cx">     String m_value;
</span><span class="cx">     String m_originalValue;
</span></span></pre>
</div>
</div>

</body>
</html>