Title: [190674] trunk
Revision
190674
Author
n_w...@apple.com
Date
2015-10-07 11:17:56 -0700 (Wed, 07 Oct 2015)

Log Message

AX: ARIA 1.1 @aria-placeholder
https://bugs.webkit.org/show_bug.cgi?id=148970

Reviewed by Chris Fleizach.

Source/WebCore:

Added support for aria-placeholder attribute.

Modified accessibility/placeholder.html test.

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::placeholderValue):
* html/HTMLAttributeNames.in:

LayoutTests:

* accessibility/placeholder-expected.txt:
* accessibility/placeholder.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (190673 => 190674)


--- trunk/LayoutTests/ChangeLog	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/LayoutTests/ChangeLog	2015-10-07 18:17:56 UTC (rev 190674)
@@ -1,3 +1,13 @@
+2015-10-07  Nan Wang  <n_w...@apple.com>
+
+        AX: ARIA 1.1 @aria-placeholder
+        https://bugs.webkit.org/show_bug.cgi?id=148970
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/placeholder-expected.txt:
+        * accessibility/placeholder.html:
+
 2015-10-06  Simon Fraser  <simon.fra...@apple.com>
 
         will-change should trigger stacking context based purely on properties

Modified: trunk/LayoutTests/accessibility/placeholder-expected.txt (190673 => 190674)


--- trunk/LayoutTests/accessibility/placeholder-expected.txt	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/LayoutTests/accessibility/placeholder-expected.txt	2015-10-07 18:17:56 UTC (rev 190674)
@@ -1,4 +1,5 @@
-  
+   Birthday:
+03-14-1879
 This test makes sure that the placeholder is returned as the correct attribute
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -6,6 +7,7 @@
 
 PASS fieldElement.stringAttributeValue('AXPlaceholderValue') is 'search'
 PASS pass.stringAttributeValue('AXPlaceholderValue') is 'Password'
+PASS search.stringAttributeValue('AXPlaceholderValue') is 'MM-DD-YYYY'
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/accessibility/placeholder.html (190673 => 190674)


--- trunk/LayoutTests/accessibility/placeholder.html	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/LayoutTests/accessibility/placeholder.html	2015-10-07 18:17:56 UTC (rev 190674)
@@ -9,6 +9,9 @@
 
     <input id="password" class="field" type="password" name="sc1798" value="" placeholder="Password" spellcheck="true" maxlength="5096">
     
+    <span id="label">Birthday:</span>
+    <div id="search" role="searchbox" aria-labelledby="label" aria-placeholder="MM-DD-YYYY">03-14-1879</div>
+    
     <p id="description"></p>
     <div id="console"></div>
      
@@ -23,10 +26,13 @@
             document.getElementById("password").focus();
             var pass = accessibilityController.focusedElement;
             shouldBe("pass.stringAttributeValue('AXPlaceholderValue')", "'Password'");
+            
+            var search = accessibilityController.accessibleElementById("search");
+            shouldBe("search.stringAttributeValue('AXPlaceholderValue')", "'MM-DD-YYYY'");
 
         }
     </script>
 
 <script src=""
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (190673 => 190674)


--- trunk/Source/WebCore/ChangeLog	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/Source/WebCore/ChangeLog	2015-10-07 18:17:56 UTC (rev 190674)
@@ -1,3 +1,18 @@
+2015-10-07  Nan Wang  <n_w...@apple.com>
+
+        AX: ARIA 1.1 @aria-placeholder
+        https://bugs.webkit.org/show_bug.cgi?id=148970
+
+        Reviewed by Chris Fleizach.
+
+        Added support for aria-placeholder attribute.
+
+        Modified accessibility/placeholder.html test.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::placeholderValue):
+        * html/HTMLAttributeNames.in:
+
 2015-10-07  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r190664.

Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (190673 => 190674)


--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp	2015-10-07 18:17:56 UTC (rev 190674)
@@ -2120,6 +2120,10 @@
 
 const AtomicString& AccessibilityObject::placeholderValue() const
 {
+    const AtomicString& ariaPlaceholder = getAttribute(aria_placeholderAttr);
+    if (!ariaPlaceholder.isEmpty())
+        return ariaPlaceholder;
+    
     const AtomicString& placeholder = getAttribute(placeholderAttr);
     if (!placeholder.isEmpty())
         return placeholder;

Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (190673 => 190674)


--- trunk/Source/WebCore/html/HTMLAttributeNames.in	2015-10-07 18:04:54 UTC (rev 190673)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in	2015-10-07 18:17:56 UTC (rev 190674)
@@ -38,6 +38,7 @@
 aria-multiselectable
 aria-orientation
 aria-owns
+aria-placeholder
 aria-posinset
 aria-pressed
 aria-readonly
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to