[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

Wed Jan 6 00:18:53 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 3fe21b2b3d773be44f02d1083f2929e2f8a2c2c9
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 18:54:56 2010 +0000

    AX: any DIV with an aria role should not be ignored
    https://bugs.webkit.org/show_bug.cgi?id=33090
    
    Reviewed by Darin Adler.
    
    WebCore:
    
    Test: platform/mac/accessibility/aria-divs-not-ignored.html
    
    * accessibility/AccessibilityRenderObject.cpp:
    (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
    
    LayoutTests:
    
    * platform/mac/accessibility/aria-divs-not-ignored-expected.txt: Added.
    * platform/mac/accessibility/aria-divs-not-ignored.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dca6208..dd5a8cf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-04  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: any DIV with an aria role should not be ignored
+        https://bugs.webkit.org/show_bug.cgi?id=33090
+
+        * platform/mac/accessibility/aria-divs-not-ignored-expected.txt: Added.
+        * platform/mac/accessibility/aria-divs-not-ignored.html: Added.
+
 2010-01-04  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored-expected.txt b/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored-expected.txt
new file mode 100644
index 0000000..d40680b
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored-expected.txt
@@ -0,0 +1,13 @@
+text
+
+This tests that a div element with nothing in, but one that has an ARIA role, will not be ignored by accessibility.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS body.childAtIndex(1).role is 'AXRole: AXGroup'
+PASS body.childAtIndex(1).subrole is 'AXSubrole: AXApplicationLog'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored.html b/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored.html
new file mode 100644
index 0000000..2fc1cb6
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-divs-not-ignored.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<h3>text</h3>
+<div class="text" role="log" aria-live="polite" id="visibleText"></div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+    description("This tests that a div element with nothing in, but one that has an ARIA role, will not be ignored by accessibility.");
+
+    if (window.accessibilityController) {
+
+          document.getElementById("body").focus();
+          var body = accessibilityController.focusedElement;
+          shouldBe("body.childAtIndex(1).role", "'AXRole: AXGroup'");
+          shouldBe("body.childAtIndex(1).subrole", "'AXSubrole: AXApplicationLog'");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7e275fd..a5ce6cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-04  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: any DIV with an aria role should not be ignored
+        https://bugs.webkit.org/show_bug.cgi?id=33090
+
+        Test: platform/mac/accessibility/aria-divs-not-ignored.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
+
 2010-01-04  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 05b970d..67762f5 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1502,6 +1502,9 @@ bool AccessibilityRenderObject::accessibilityIsIgnored() const
     if (isControl())
         return false;
     
+    if (ariaRole != UnknownRole)
+        return false;
+    
     // don't ignore labels, because they serve as TitleUIElements
     Node* node = m_renderer->node();
     if (node && node->hasTagName(labelTag))
@@ -1545,9 +1548,6 @@ bool AccessibilityRenderObject::accessibilityIsIgnored() const
         return false;
     }
     
-    if (ariaRole != UnknownRole)
-        return false;
-    
     // make a platform-specific decision
     if (isAttachment())
         return accessibilityIgnoreAttachment();

-- 
WebKit Debian packaging

