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

cfleizach at apple.com cfleizach at apple.com
Fri Jan 21 14:52:51 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit e0bbf468fcabfaf943ff33be7ed9094f6317aba5
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 20:01:03 2011 +0000

    AX: Regression: WebKit no longer auto-scrolls with VoiceOver navigation
    https://bugs.webkit.org/show_bug.cgi?id=51833
    
    Reviewed by Darin Adler.
    
    WebCore:
    
    Make sure the web area returns the contentsSize, not the same size as what is displayed.
    
    Test: platform/mac/accessibility/webarea-size-equals-content-size.html
    
    * accessibility/AccessibilityRenderObject.cpp:
    (WebCore::AccessibilityRenderObject::boundingBoxRect):
    
    LayoutTests:
    
    * platform/mac/accessibility/webarea-size-equals-content-size-expected.txt: Added.
    * platform/mac/accessibility/webarea-size-equals-content-size.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c9a7645..f8c1b2f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-03  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: Regression: WebKit no longer auto-scrolls with VoiceOver navigation
+        https://bugs.webkit.org/show_bug.cgi?id=51833
+
+        * platform/mac/accessibility/webarea-size-equals-content-size-expected.txt: Added.
+        * platform/mac/accessibility/webarea-size-equals-content-size.html: Added.
+
 2011-01-03  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed, Chromium test expectation update.
diff --git a/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size-expected.txt b/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size-expected.txt
new file mode 100644
index 0000000..6d51e36
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size-expected.txt
@@ -0,0 +1,22 @@
+
+text 
+text 
+text 
+text 
+text 
+text 
+text 
+text
+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: AXWebArea'
+PASS accessibilityController.focusedElement.parentElement().role is 'AXRole: AXScrollArea'
+PASS webAreaWidth > scrollWidth is true
+PASS webAreaHeight > scrollHeight is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size.html b/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size.html
new file mode 100644
index 0000000..277e2ae
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/webarea-size-equals-content-size.html
@@ -0,0 +1,64 @@
+<!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">
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<img src="resources/cake.png" width=1000 height=1000><br>
+text
+
+<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("body").focus();
+        shouldBe("accessibilityController.focusedElement.role", "'AXRole: AXWebArea'");
+        shouldBe("accessibilityController.focusedElement.parentElement().role", "'AXRole: AXScrollArea'");
+
+        var webAreaHeight = accessibilityController.focusedElement.height;
+        var webAreaWidth = accessibilityController.focusedElement.width;
+
+        var scrollHeight = accessibilityController.focusedElement.parentElement().height;
+        var scrollWidth = accessibilityController.focusedElement.parentElement().width;
+
+        shouldBeTrue("webAreaWidth > scrollWidth");
+        shouldBeTrue("webAreaHeight > scrollHeight");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 610fd6e..1cca268 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-03  Chris Fleizach  <cfleizach at apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: Regression: WebKit no longer auto-scrolls with VoiceOver navigation
+        https://bugs.webkit.org/show_bug.cgi?id=51833
+
+        Make sure the web area returns the contentsSize, not the same size as what is displayed.
+
+        Test: platform/mac/accessibility/webarea-size-equals-content-size.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::boundingBoxRect):
+
 2011-01-03  Simon Fraser  <simon.fraser at apple.com>
 
         Fix warning in 32-bit builds.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index c119195..003acda 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1418,6 +1418,11 @@ IntRect AccessibilityRenderObject::boundingBoxRect() const
             result.unite(r);
         }
     }
+
+    // The size of the web area should be the content size, not the clipped size.
+    if (isWebArea() && obj->frame()->view())
+        result.setSize(obj->frame()->view()->contentsSize());
+    
     return result;
 }
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list