[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

Mon Dec 27 16:31:02 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 2debe5f2c7bc9eb0742af3c8be39d07fb199677f
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 21:34:01 2010 +0000

    WebCore: WAI-ARIA menubar role mapped to AXGroup, should be AXMenuBar
    https://bugs.webkit.org/show_bug.cgi?id=51488
    
    Reviewed by Darin Adler.
    
    Test: platform/mac/accessibility/aria-menubar.html
    
    * accessibility/AccessibilityObject.cpp:
    (WebCore::createARIARoleMap):
    
    LayoutTests: Update fast/canvas/webgl/gl-uniform-arrays.html to bring in sync with Khronos
    https://bugs.webkit.org/show_bug.cgi?id=51489
    
    Patch by Kenneth Russell <kbr at google.com> on 2010-12-22
    Reviewed by David Levin.
    
    * fast/canvas/webgl/gl-uniform-arrays-expected.txt:
    * fast/canvas/webgl/gl-uniform-arrays.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74501 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 781b5ef..12c1357 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -20,6 +20,16 @@
 
 2010-12-22  Chris Fleizach  <cfleizach at apple.com>
 
+        Reviewed by Darin Adler.
+
+        WAI-ARIA menubar role mapped to AXGroup, should be AXMenuBar
+        https://bugs.webkit.org/show_bug.cgi?id=51488
+
+        * platform/mac/accessibility/aria-menubar-expected.txt: Added.
+        * platform/mac/accessibility/aria-menubar.html: Added.
+
+2010-12-22  Chris Fleizach  <cfleizach at apple.com>
+
         Reviewed by Sam Weining.
 
         AX: WAI-ARIA textbox role needs different AXRole, depending on value of aria-multiline property
diff --git a/LayoutTests/platform/mac/accessibility/aria-menubar-expected.txt b/LayoutTests/platform/mac/accessibility/aria-menubar-expected.txt
new file mode 100644
index 0000000..1cab99e
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-menubar-expected.txt
@@ -0,0 +1,11 @@
+menubar
+This tests that an ARIA menu bar is exposed as a menu bar.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS accessibilityController.focusedElement.role is 'AXRole: AXMenuBar'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/aria-menubar.html b/LayoutTests/platform/mac/accessibility/aria-menubar.html
new file mode 100644
index 0000000..cf71978
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-menubar.html
@@ -0,0 +1,32 @@
+<!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">
+
+<div tabindex="0" id="menu" role="menubar">menubar</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+    description("This tests that an ARIA menu bar is exposed as a menu bar.");
+
+    if (window.accessibilityController) {
+
+        document.getElementById("menu").focus();
+        shouldBe("accessibilityController.focusedElement.role", "'AXRole: AXMenuBar'");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 99e0d5f..b033207 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-22  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WAI-ARIA menubar role mapped to AXGroup, should be AXMenuBar
+        https://bugs.webkit.org/show_bug.cgi?id=51488
+
+        Test: platform/mac/accessibility/aria-menubar.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::createARIARoleMap):
+
 2010-12-22  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/accessibility/AccessibilityObject.cpp b/WebCore/accessibility/AccessibilityObject.cpp
index 85ccb61..e6c991f 100644
--- a/WebCore/accessibility/AccessibilityObject.cpp
+++ b/WebCore/accessibility/AccessibilityObject.cpp
@@ -923,7 +923,7 @@ static ARIARoleMap* createARIARoleMap()
         { "marquee", ApplicationMarqueeRole },
         { "math", DocumentMathRole },
         { "menu", MenuRole },
-        { "menubar", GroupRole },
+        { "menubar", MenuBarRole },
         // "menuitem" isn't here because it may map to different roles depending on the parent element's role
         { "menuitemcheckbox", MenuItemRole },
         { "menuitemradio", MenuItemRole },

-- 
WebKit Debian packaging

