[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

Wed Mar 17 17:55:57 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 6a82c62759a2718d96ddd48b7ea2768c88e2887d
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 19:29:24 2010 +0000

    AX: AXFocused is not writable like it should be on nodes
    https://bugs.webkit.org/show_bug.cgi?id=35186
    
    Reviewed by Beth Dakin.
    
    WebCore:
    
    Test: platform/mac/accessibility/element-focus.html
    
    * accessibility/AccessibilityRenderObject.cpp:
    (WebCore::AccessibilityRenderObject::canSetFocusAttribute):
    
    LayoutTests:
    
    * platform/mac/accessibility/element-focus-expected.txt: Added.
    * platform/mac/accessibility/element-focus.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2b594c4..5a8dd8a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-22  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        AX: AXFocused is not writable like it should be on nodes
+        https://bugs.webkit.org/show_bug.cgi?id=35186
+
+        * platform/mac/accessibility/element-focus-expected.txt: Added.
+        * platform/mac/accessibility/element-focus.html: Added.
+
 2010-02-07  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/mac/accessibility/element-focus-expected.txt b/LayoutTests/platform/mac/accessibility/element-focus-expected.txt
new file mode 100644
index 0000000..ab201bc
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/element-focus-expected.txt
@@ -0,0 +1,18 @@
+link
+text
+foo
+This tests that any element that supports focus has a writable AXFocused
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS body.childAtIndex(0).childAtIndex(0).role is 'AXRole: AXLink'
+PASS body.childAtIndex(0).childAtIndex(0).isAttributeSettable('AXFocused') is true
+PASS body.childAtIndex(1).role is 'AXRole: AXStaticText'
+PASS body.childAtIndex(1).isAttributeSettable('AXFocused') is true
+PASS body.childAtIndex(2).childAtIndex(0).role is 'AXRole: AXGroup'
+PASS body.childAtIndex(2).childAtIndex(0).isAttributeSettable('AXFocused') is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/element-focus.html b/LayoutTests/platform/mac/accessibility/element-focus.html
new file mode 100644
index 0000000..2d6b33f
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/element-focus.html
@@ -0,0 +1,48 @@
+<!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">
+
+<a href="#">link</a><br>
+
+<div role="text" aria-label="text" tabindex=0>text</div>
+
+<div role="list">
+  <div role="listitem" tabindex="0">foo</div>
+</div>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+    description("This tests that any element that supports focus has a writable AXFocused");
+
+    if (window.accessibilityController) {
+
+          var root = accessibilityController.rootElement;
+          var body = root.childAtIndex(0);
+
+          shouldBe("body.childAtIndex(0).childAtIndex(0).role", "'AXRole: AXLink'");
+          shouldBe("body.childAtIndex(0).childAtIndex(0).isAttributeSettable('AXFocused')", "true");
+
+          shouldBe("body.childAtIndex(1).role", "'AXRole: AXStaticText'");
+          shouldBe("body.childAtIndex(1).isAttributeSettable('AXFocused')", "true");
+
+          shouldBe("body.childAtIndex(2).childAtIndex(0).role", "'AXRole: AXGroup'");
+          shouldBe("body.childAtIndex(2).childAtIndex(0).isAttributeSettable('AXFocused')", "true");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c43662..7cba3f4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-22  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        AX: AXFocused is not writable like it should be on nodes
+        https://bugs.webkit.org/show_bug.cgi?id=35186
+
+        Test: platform/mac/accessibility/element-focus.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::canSetFocusAttribute):
+
 2010-02-22  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein, Darin Adler.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index d738ca8..7b73012 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2794,7 +2794,7 @@ bool AccessibilityRenderObject::canSetFocusAttribute() const
     case SliderRole:
         return true;
     default:
-        return false;
+        return node->supportsFocus();
     }
 }
     

-- 
WebKit Debian packaging

