Title: [92158] trunk
Revision
92158
Author
commit-qu...@webkit.org
Date
2011-08-01 17:51:38 -0700 (Mon, 01 Aug 2011)

Log Message

WAI-ARIA textbox role should be AXTextArea for aria-multiline=true, AXTextField for aria-multiline=false
https://bugs.webkit.org/show_bug.cgi?id=65451

Patch by Alice Boxhall <aboxh...@chromium.org> on 2011-08-01
Reviewed by Chris Fleizach.

Source/WebCore:

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::determineAriaRoleAttribute):

LayoutTests:

* accessibility/aria-roles.html:
* platform/mac/accessibility/aria-multiline.html:
* platform/mac/accessibility/aria-roles-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (92157 => 92158)


--- trunk/LayoutTests/ChangeLog	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/LayoutTests/ChangeLog	2011-08-02 00:51:38 UTC (rev 92158)
@@ -1,3 +1,14 @@
+2011-08-01  Alice Boxhall  <aboxh...@chromium.org>
+
+        WAI-ARIA textbox role should be AXTextArea for aria-multiline=true, AXTextField for aria-multiline=false
+        https://bugs.webkit.org/show_bug.cgi?id=65451
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/aria-roles.html:
+        * platform/mac/accessibility/aria-multiline.html:
+        * platform/mac/accessibility/aria-roles-expected.txt:
+
 2011-08-01  Zhenyao Mo  <z...@google.com>
 
         Unreviewed, rebaseline, webkit gardener stuff.

Modified: trunk/LayoutTests/accessibility/aria-roles.html (92157 => 92158)


--- trunk/LayoutTests/accessibility/aria-roles.html	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/LayoutTests/accessibility/aria-roles.html	2011-08-02 00:51:38 UTC (rev 92158)
@@ -118,7 +118,7 @@
     <p>The following should be a text box:</p>
     <p><span tabindex="0" role="textbox" id="ariaTextBox">X</span></p>
     <p>Actual text box:</p>
-    <textarea id="realTextBox">Hello</textarea>
+    <input type="text" id="realTextBox"></input>
     <span id="resultTextBox"></span>
     <script>
         validateRole(document.getElementById('ariaTextBox'),

Modified: trunk/LayoutTests/platform/mac/accessibility/aria-multiline.html (92157 => 92158)


--- trunk/LayoutTests/platform/mac/accessibility/aria-multiline.html	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-multiline.html	2011-08-02 00:51:38 UTC (rev 92158)
@@ -9,8 +9,8 @@
 </head>
 <body id="body">
 
-<div tabindex="0" id="textfield" role="textbox" aria-multiline="true">a</div>
-<div tabindex="0" id="textarea" role="textbox" aria-multiline="false">b</div>
+<div tabindex="0" id="textfield" role="textbox" aria-multiline="false">a</div>
+<div tabindex="0" id="textarea" role="textbox" aria-multiline="true">b</div>
 
 <p id="description"></p>
 <div id="console"></div>

Modified: trunk/LayoutTests/platform/mac/accessibility/aria-roles-expected.txt (92157 => 92158)


--- trunk/LayoutTests/platform/mac/accessibility/aria-roles-expected.txt	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-roles-expected.txt	2011-08-02 00:51:38 UTC (rev 92158)
@@ -50,7 +50,7 @@
 
 Actual text box:
 
- This test PASSES in DumpRenderTree. The role is AXRole: AXTextArea
+ This test PASSES in DumpRenderTree. The role is AXRole: AXTextField
 
 The following should be an image:
 

Modified: trunk/Source/WebCore/ChangeLog (92157 => 92158)


--- trunk/Source/WebCore/ChangeLog	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/Source/WebCore/ChangeLog	2011-08-02 00:51:38 UTC (rev 92158)
@@ -1,3 +1,13 @@
+2011-08-01  Alice Boxhall  <aboxh...@chromium.org>
+
+        WAI-ARIA textbox role should be AXTextArea for aria-multiline=true, AXTextField for aria-multiline=false
+        https://bugs.webkit.org/show_bug.cgi?id=65451
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::determineAriaRoleAttribute):
+
 2011-08-01  srikumar bonda  <srikuma...@gmail.com>
 
         Use threadsafeCopy() API when using Database Directory path variable 

Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (92157 => 92158)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2011-08-02 00:49:54 UTC (rev 92157)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2011-08-02 00:51:38 UTC (rev 92158)
@@ -2996,7 +2996,7 @@
     if (role == ButtonRole && ariaHasPopup())
         role = PopUpButtonRole;
 
-    if (role == TextAreaRole && ariaIsMultiline())
+    if (role == TextAreaRole && !ariaIsMultiline())
         role = TextFieldRole;
     
     if (role)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to