[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 00:54:12 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 7bfe8c11088cad98c6a4884c9411e53a14c60d47
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 03:40:59 2010 +0000

    MSAA: Accessibility role of <select> elements is wrong
    
    https://bugs.webkit.org/show_bug.cgi?id=33192
    
    Reviewed by Sam Weinig.
    
    WebKit/win:
    
    * AccessibleBase.cpp:
    (MSAARole):
    Map WebCore::PopUpButtonRole to MSAA's ROLE_SYSTEM_COMBOBOX.
    
    LayoutTests:
    
    * platform/win/accessibility/select-element-role-expected.txt: Added.
    * platform/win/accessibility/select-element-role.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index af79dcf..c8d3064 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-04  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        MSAA: Accessibility role of <select> elements is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=33192
+
+        Reviewed by Sam Weinig.
+
+        * platform/win/accessibility/select-element-role-expected.txt: Added.
+        * platform/win/accessibility/select-element-role.html: Added.
+
+2010-01-04  Jon Honeycutt  <jhoneycutt at apple.com>
+
         MSAA: <select> elements should broadcast value change events
 
         https://bugs.webkit.org/show_bug.cgi?id=33088
diff --git a/LayoutTests/platform/win/accessibility/select-element-role-expected.txt b/LayoutTests/platform/win/accessibility/select-element-role-expected.txt
new file mode 100644
index 0000000..7f3d8d3
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/select-element-role-expected.txt
@@ -0,0 +1,6 @@
+This tests that select elements have the correct role.
+
+
+
+PASS accessibilityController.focusedElement.role is "combo box"
+
diff --git a/LayoutTests/platform/win/accessibility/select-element-role.html b/LayoutTests/platform/win/accessibility/select-element-role.html
new file mode 100644
index 0000000..45d301d
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/select-element-role.html
@@ -0,0 +1,32 @@
+<html>
+
+<head>
+    <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+    <script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+
+<body id="body">
+
+<p>This tests that select elements have the correct role.</p>
+
+<p id="notDRT">This test should only be run inside of DumpRenderTree.</p>
+
+<select id="selectElement" title="selectElement">
+    <option SELECTED>Option 1</option>
+</select>
+
+<p id="console"></p>
+
+<script>
+    if (window.layoutTestController && window.accessibilityController) {
+        document.getElementById("notDRT").style.visibility = "hidden";
+
+        layoutTestController.dumpAsText();
+
+        document.getElementById("selectElement").focus();
+
+        shouldBe('accessibilityController.focusedElement.role', '"combo box"');
+    }
+</script>
+</body>
+</html>
diff --git a/WebKit/win/AccessibleBase.cpp b/WebKit/win/AccessibleBase.cpp
index 0b42ae3..90818b5 100644
--- a/WebKit/win/AccessibleBase.cpp
+++ b/WebKit/win/AccessibleBase.cpp
@@ -567,6 +567,8 @@ static long MSAARole(AccessibilityRole role)
             return ROLE_SYSTEM_GRAPHIC;
         case WebCore::ListItemRole:
             return ROLE_SYSTEM_LISTITEM;
+        case WebCore::PopUpButtonRole:
+            return ROLE_SYSTEM_COMBOBOX;
         default:
             // This is the default role for MSAA.
             return ROLE_SYSTEM_CLIENT;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 1c4d0e0..378c8ff 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-04  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        MSAA: Accessibility role of <select> elements is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=33192
+
+        Reviewed by Sam Weinig.
+
+        * AccessibleBase.cpp:
+        (MSAARole):
+        Map WebCore::PopUpButtonRole to MSAA's ROLE_SYSTEM_COMBOBOX.
+
 2010-01-04  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging

