<!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>[42949] 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/42949">42949</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2009-04-28 12:37:09 -0700 (Tue, 28 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Bug 25453: AX: fall back to PLACEHOLDER attr if form element is not labeled
https://bugs.webkit.org/show_bug.cgi?id=25453</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="#trunkWebCorepageAccessibilityRenderObjectcpp">trunk/WebCore/page/AccessibilityRenderObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityplaceholderexpectedtxt">trunk/LayoutTests/accessibility/placeholder-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityplaceholderhtml">trunk/LayoutTests/accessibility/placeholder.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (42948 => 42949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-04-28 19:33:12 UTC (rev 42948)
+++ trunk/LayoutTests/ChangeLog        2009-04-28 19:37:09 UTC (rev 42949)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2009-04-28  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Darin Alder.
+
+        Bug 25453: AX: fall back to PLACEHOLDER attr if form element is not labeled
+        https://bugs.webkit.org/show_bug.cgi?id=25453
+
+        * accessibility/placeholder-expected.txt: Added.
+        * accessibility/placeholder.html: Added.
+
+2009-04-28  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
</ins><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><span class="cx">         Bug 25452: AX: Don't create addition space AXStaticText element for every bold or link tag
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityplaceholderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/placeholder-expected.txt (0 => 42949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/placeholder-expected.txt                                (rev 0)
+++ trunk/LayoutTests/accessibility/placeholder-expected.txt        2009-04-28 19:37:09 UTC (rev 42949)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+Test passed
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityplaceholderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/placeholder.html (0 => 42949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/placeholder.html                                (rev 0)
+++ trunk/LayoutTests/accessibility/placeholder.html        2009-04-28 19:37:09 UTC (rev 42949)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;html&gt;
+&lt;script&gt;
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+&lt;/script&gt;
+&lt;body id=&quot;body&quot;&gt;

+    &lt;!-- This test makes sure that the AXTitle will fall back to placeholder text if nothing else is available --&gt;

+    &lt;input placeholder=&quot;search&quot; type=&quot;text&quot; name=&quot;q&quot; size=&quot;15&quot; maxlength=&quot;255&quot; id=&quot;searchterm&quot; /&gt;
+    
+    &lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
+
+     
+    &lt;script&gt;
+        if (window.accessibilityController) {
+            var result = document.getElementById(&quot;result&quot;);
+
+            var field = document.getElementById(&quot;searchterm&quot;);
+            field.focus();
+            var fieldElement = accessibilityController.focusedElement;
+            
+            var pattern = &quot;AXTitle: search&quot;;
+            if (fieldElement.allAttributes().indexOf(pattern) != -1) {
+                result.innerText += &quot;Test passed\n&quot;;
+            }
+            else {
+                 result.innerText += &quot;Test failed\n&quot;;
+            }
+        }
+    &lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42948 => 42949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-28 19:33:12 UTC (rev 42948)
+++ trunk/WebCore/ChangeLog        2009-04-28 19:37:09 UTC (rev 42949)
</span><span class="lines">@@ -2,6 +2,18 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><ins>+        Bug 25453: AX: fall back to PLACEHOLDER attr if form element is not labeled
+        https://bugs.webkit.org/show_bug.cgi?id=25453
+
+        Test: accessibility/placeholder.html
+
+        * page/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::title):
+
+2009-04-28  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
</ins><span class="cx">         Bug 25452: AX: Don't create addition space AXStaticText element for every bold or link tag
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=25452
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorepageAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/AccessibilityRenderObject.cpp (42948 => 42949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/AccessibilityRenderObject.cpp        2009-04-28 19:33:12 UTC (rev 42948)
+++ trunk/WebCore/page/AccessibilityRenderObject.cpp        2009-04-28 19:37:09 UTC (rev 42949)
</span><span class="lines">@@ -908,6 +908,10 @@
</span><span class="cx">         HTMLLabelElement* label = labelForElement(static_cast&lt;Element*&gt;(node));
</span><span class="cx">         if (label &amp;&amp; !titleUIElement())
</span><span class="cx">             return label-&gt;innerText();
</span><ins>+        
+        const AtomicString&amp; placeholder = getAttribute(placeholderAttr);
+        if (!placeholder.isEmpty())
+            return placeholder;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     if (roleValue() == ButtonRole
</span></span></pre>
</div>
</div>

</body>
</html>