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

Tue Jan 5 23:54:36 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 5a46a7397f21f70be5c87b1942f33a6bcd957a38
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 19 00:05:14 2009 +0000

    MSAA: Accessibility role of list markers is wrong
    
    https://bugs.webkit.org/show_bug.cgi?id=32687
    
    Reviewed by Adam Roben.
    
    WebKit/win:
    
    * AccessibleBase.cpp:
    (MSAARole):
    Make the WebCore list marker role map to the MSAA static text role.
    
    LayoutTests:
    
    * platform/win/accessibility/list-marker-role-expected.txt: Added.
    * platform/win/accessibility/list-marker-role.html: Added.
    Verify that the list marker role is "text".
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 50e6e16..a312d81 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-17  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        MSAA: Accessibility role of list markers is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=32687
+
+        Reviewed by Adam Roben.
+
+        * platform/win/accessibility/list-marker-role-expected.txt: Added.
+        * platform/win/accessibility/list-marker-role.html: Added.
+        Verify that the list marker role is "text".
+
 2009-12-18  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/LayoutTests/platform/win/accessibility/list-marker-role-expected.txt b/LayoutTests/platform/win/accessibility/list-marker-role-expected.txt
new file mode 100644
index 0000000..d70e575
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/list-marker-role-expected.txt
@@ -0,0 +1,6 @@
+This test verifies that, on Windows, list markers return the non-editable "text" role. 
+
+
+list item
+PASS listMarker.role is "text"
+
diff --git a/LayoutTests/platform/win/accessibility/list-marker-role.html b/LayoutTests/platform/win/accessibility/list-marker-role.html
new file mode 100644
index 0000000..9bd17d0
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/list-marker-role.html
@@ -0,0 +1,34 @@
+<html>
+    <head>
+        <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+        <script src="../../../fast/js/resources/js-test-pre.js"></script>
+
+        <script>
+            if (window.layoutTestController)
+                layoutTestController.dumpAsText();
+        </script>
+    </head>
+    <body id="body">
+        <p>
+            This test verifies that, on Windows, list markers return the
+            non-editable "text" role.
+            <br><br>
+            <a href="https://bugs.webkit.org/show_bug.cgi?id="></a>
+        </p>
+
+        <ul>
+            <li id="listItem" tabindex="1">list item</li>
+        </ul>
+
+        <p id="console"></p>
+
+        <script>
+            if (window.accessibilityController) {
+                document.getElementById("listItem").focus();
+
+                var listMarker = accessibilityController.focusedElement.childAtIndex(0);
+                shouldBe('listMarker.role', '"text"');
+            }
+        </script>
+    </body>
+</html>
diff --git a/WebKit/win/AccessibleBase.cpp b/WebKit/win/AccessibleBase.cpp
index 42b3b11..f87bb99 100644
--- a/WebKit/win/AccessibleBase.cpp
+++ b/WebKit/win/AccessibleBase.cpp
@@ -542,9 +542,9 @@ static long MSAARole(AccessibilityRole role)
             return ROLE_SYSTEM_PAGETABLIST;
         case WebCore::TextFieldRole:
         case WebCore::TextAreaRole:
-        case WebCore::ListMarkerRole:
         case WebCore::EditableTextRole:
             return ROLE_SYSTEM_TEXT;
+        case WebCore::ListMarkerRole:
         case WebCore::StaticTextRole:
             return ROLE_SYSTEM_STATICTEXT;
         case WebCore::OutlineRole:
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 28f0812..fb6f2ae 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-17  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        MSAA: Accessibility role of list markers is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=32687
+
+        Reviewed by Adam Roben.
+
+        * AccessibleBase.cpp:
+        (MSAARole):
+        Make the WebCore list marker role map to the MSAA static text role.
+
 2009-12-18  Adam Roben  <aroben at apple.com>
 
         Add #includes needed after WebCore clean-up

-- 
WebKit Debian packaging

