[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:23:27 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 8f8a99a5b7ba57aaafb31166ff18fb4af136991d
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 23:27:16 2010 +0000

    AX: REGRESSION: WebKit does not report label of web popup buttons
    https://bugs.webkit.org/show_bug.cgi?id=45715
    
    Reviewed by Darin Adler.
    
    WebCore:
    
    Test: platform/mac/accessibility/popup-button-title.html
    
    * WebCore.xcodeproj/project.pbxproj:
    * accessibility/AccessibilityRenderObject.cpp:
    (WebCore::AccessibilityRenderObject::title):
    
    LayoutTests:
    
    * platform/mac/accessibility/popup-button-title-expected.txt: Added.
    * platform/mac/accessibility/popup-button-title.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e5d52c0..7661b32 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-13  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: REGRESSION: WebKit does not report label of web popup buttons
+        https://bugs.webkit.org/show_bug.cgi?id=45715
+
+        * platform/mac/accessibility/popup-button-title-expected.txt: Added.
+        * platform/mac/accessibility/popup-button-title.html: Added.
+
 2010-09-13  Dirk Pranke  <dpranke at chromium.org>
 
         Unreviewed, expectations change.
diff --git a/LayoutTests/platform/mac/accessibility/popup-button-title-expected.txt b/LayoutTests/platform/mac/accessibility/popup-button-title-expected.txt
new file mode 100644
index 0000000..64dad16
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/popup-button-title-expected.txt
@@ -0,0 +1,12 @@
+Click me
+
+This tests that a popup button will return the text under the element for its title.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element.title is 'AXTitle: Click me'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/popup-button-title.html b/LayoutTests/platform/mac/accessibility/popup-button-title.html
new file mode 100644
index 0000000..ee133a5
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/popup-button-title.html
@@ -0,0 +1,34 @@
+<!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">
+
+<p><a id="link" role="button" aria-owns="popup" aria-haspopup="true" tabindex="0" href="#">Click me</a></p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+    description("This tests that a popup button will return the text under the element for its title.");
+
+    if (window.accessibilityController) {
+        document.getElementById("link").focus();
+        var element = accessibilityController.focusedElement;
+
+        // The element should not be ignored (it should be a group)
+        shouldBe("element.title", "'AXTitle: Click me'");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 103e05c..7af98e8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: REGRESSION: WebKit does not report label of web popup buttons
+        https://bugs.webkit.org/show_bug.cgi?id=45715
+
+        Test: platform/mac/accessibility/popup-button-title.html
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::title):
+
 2010-09-13  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Dumitru Daniliuc.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 3cf32d4..acb9051 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1310,10 +1310,9 @@ String AccessibilityRenderObject::title() const
         || ariaRole == RadioButtonRole
         || ariaRole == CheckBoxRole
         || ariaRole == TabRole
-        || isHeading())
-        return textUnderElement();
-    
-    if (isLink())
+        || ariaRole == PopUpButtonRole
+        || isHeading()
+        || isLink())
         return textUnderElement();
     
     return String();

-- 
WebKit Debian packaging

