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

Thu Apr 8 01:11:13 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit dc762e0ae37635205fc879ba9e5e792846fef1db
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 17 01:42:53 2010 +0000

    MSAA: Screen rect for <option> elements is always the zero rect
    
    https://bugs.webkit.org/show_bug.cgi?id=33758
    
    Reviewed by Oliver Hunt.
    
    WebKit/win:
    
    * AccessibleBase.cpp:
    (AccessibleBase::accLocation):
    Use elementRect() rather than boundingBoxRect(), which
    AccessibilityListBoxOption overrides.
    
    LayoutTests:
    
    * platform/win/accessibility/option-element-position-and-size-expected.txt: Added.
    * platform/win/accessibility/option-element-position-and-size.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fdebb44..9b5a170 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-15  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        MSAA: Screen rect for <option> elements is always the zero rect
+
+        https://bugs.webkit.org/show_bug.cgi?id=33758
+
+        Reviewed by Oliver Hunt.
+
+        * platform/win/accessibility/option-element-position-and-size-expected.txt: Added.
+        * platform/win/accessibility/option-element-position-and-size.html: Added.
+
+2010-01-15  Jon Honeycutt  <jhoneycutt at apple.com>
+
         get_accParent should try to retrieve parent AccessibilityObject, before
         calling upon window
 
diff --git a/LayoutTests/platform/win/accessibility/option-element-position-and-size-expected.txt b/LayoutTests/platform/win/accessibility/option-element-position-and-size-expected.txt
new file mode 100644
index 0000000..1f6eb00
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/option-element-position-and-size-expected.txt
@@ -0,0 +1,7 @@
+This tests that option elements have the correct size.
+
+
+
+width: 51
+height: 14
+
diff --git a/LayoutTests/platform/win/accessibility/option-element-position-and-size.html b/LayoutTests/platform/win/accessibility/option-element-position-and-size.html
new file mode 100644
index 0000000..d9056d8
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/option-element-position-and-size.html
@@ -0,0 +1,35 @@
+<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 option elements have the correct size.</p>
+
+<p id="notDRT">This test should only be run inside of DumpRenderTree.</p>
+
+<select id="selectElement" multiple>
+    <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();
+
+        var optionElement = accessibilityController.focusedElement.childAtIndex(0);
+
+        debug("width: " + optionElement.width);
+        debug("height: " + optionElement.height);
+    }
+</script>
+</body>
+</html>
diff --git a/WebKit/win/AccessibleBase.cpp b/WebKit/win/AccessibleBase.cpp
index ba05102..feb6a09 100644
--- a/WebKit/win/AccessibleBase.cpp
+++ b/WebKit/win/AccessibleBase.cpp
@@ -419,7 +419,7 @@ HRESULT STDMETHODCALLTYPE AccessibleBase::accLocation(long* left, long* top, lon
     if (!childObj->documentFrameView())
         return E_FAIL;
 
-    IntRect screenRect(childObj->documentFrameView()->contentsToScreen(childObj->boundingBoxRect()));
+    IntRect screenRect(childObj->documentFrameView()->contentsToScreen(childObj->elementRect()));
     *left = screenRect.x();
     *top = screenRect.y();
     *width = screenRect.width();
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6d7fbf8..7dbf3d2 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-15  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        MSAA: Screen rect for <option> elements is always the zero rect
+
+        https://bugs.webkit.org/show_bug.cgi?id=33758
+
+        Reviewed by Oliver Hunt.
+
+        * AccessibleBase.cpp:
+        (AccessibleBase::accLocation):
+        Use elementRect() rather than boundingBoxRect(), which
+        AccessibilityListBoxOption overrides.
+
+2010-01-15  Jon Honeycutt  <jhoneycutt at apple.com>
+
         get_accParent should try to retrieve parent AccessibilityObject, before
         calling upon window
 

-- 
WebKit Debian packaging

