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

Wed Dec 22 13:59:40 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 90afe4d4bed04f1448459d8a9d0a5e923771ff5b
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 00:39:14 2010 +0000

    2010-09-30  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Jon Honeycutt.
    
            REGRESSION (r65681): Crash in AccessibilityUIElement::addSelection when running platform/win/accessibility/selection-and-focus.html
            https://bugs.webkit.org/show_bug.cgi?id=46913
    
            REGRESSION (r65681): platform/win/accessibility/img-alt-attribute.html failing on Windows
            https://bugs.webkit.org/show_bug.cgi?id=46914
    
            <rdar://problem/8497332&8497393>
    
            Fix two layout tests that made incorrect assumptions about the structure of the
            accessibility tree.
    
            * platform/win/Skipped:
            * platform/win/accessibility/img-alt-attribute.html:
            * platform/win/accessibility/selection-and-focus.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68855 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d1d032..010ccec 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-30  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        REGRESSION (r65681): Crash in AccessibilityUIElement::addSelection when running platform/win/accessibility/selection-and-focus.html
+        https://bugs.webkit.org/show_bug.cgi?id=46913
+
+        REGRESSION (r65681): platform/win/accessibility/img-alt-attribute.html failing on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=46914
+
+        <rdar://problem/8497332&8497393>
+
+        Fix two layout tests that made incorrect assumptions about the structure of the
+        accessibility tree.
+
+        * platform/win/Skipped:
+        * platform/win/accessibility/img-alt-attribute.html:
+        * platform/win/accessibility/selection-and-focus.html:
+
 2010-09-30  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 8d0e82e..04c1c26 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -312,12 +312,6 @@ websocket/tests/workers/worker-handshake-challenge-randomness.html
 # http://webkit.org/b/46911
 accessibility/aria-hidden-update.html
 
-# Crash in AccessibilityUIElement::addSelection http://webkit.org/b/46913
-platform/win/accessibility/selection-and-focus.html
-
-# http://webkit.org/b/46914
-platform/win/accessibility/img-alt-attribute.html
-
 # http://webkit.org/b/46919
 svg/custom/clip-path-referencing-use2.svg
 
diff --git a/LayoutTests/platform/win/accessibility/img-alt-attribute.html b/LayoutTests/platform/win/accessibility/img-alt-attribute.html
index 910164d..0b6728c 100644
--- a/LayoutTests/platform/win/accessibility/img-alt-attribute.html
+++ b/LayoutTests/platform/win/accessibility/img-alt-attribute.html
@@ -8,7 +8,7 @@
                 layoutTestController.dumpAsText();
         </script>
     </head>
-    <body id="body">
+    <body>
         <img aria-labeledby="desc" alt="alternate text" title="title">
         <img alt="alternate text" title="title">
 
@@ -24,12 +24,14 @@
 
         <script>
             if (window.accessibilityController) {
-                document.getElementById("body").focus();
+                document.body.focus();
 
-                var e = accessibilityController.focusedElement.childAtIndex(0);
+                var anonymousBlock = accessibilityController.focusedElement.childAtIndex(0);
+                var e = anonymousBlock.childAtIndex(0);
+                
                 shouldBe('e.title', '"ARIA labeled-by name"');
 
-                e = accessibilityController.focusedElement.childAtIndex(1);
+                e = anonymousBlock.childAtIndex(1);
                 shouldBe('e.title', '"alternate text"');
             }
         </script>
diff --git a/LayoutTests/platform/win/accessibility/selection-and-focus.html b/LayoutTests/platform/win/accessibility/selection-and-focus.html
index 806bf04..cf6d04a 100644
--- a/LayoutTests/platform/win/accessibility/selection-and-focus.html
+++ b/LayoutTests/platform/win/accessibility/selection-and-focus.html
@@ -4,7 +4,7 @@
     <script src="../../../fast/js/resources/js-test-pre.js"></script>
 </head>
 
-<body id="body">
+<body>
 
 <select id="selectElement" multiple title="selectElement">
     <option SELECTED>Option 0</option>
@@ -39,12 +39,15 @@
         document.getElementById("notDRT").style.visibility = "hidden";
 
         layoutTestController.dumpAsText();
-
-        document.getElementById("body").focus();
+        
+        document.body.focus();
         shouldBe('accessibilityController.focusedElement.role', '"document"');
 
+        var anonymousBlock = accessibilityController.focusedElement.childAtIndex(0);
+        
         // Focus the select element.
-        accessibilityController.focusedElement.childAtIndex(0).takeFocus();
+        var select = anonymousBlock.childAtIndex(0);
+        select.takeFocus();
         shouldBe('accessibilityController.focusedElement.role', '"list"');
 
         debug("");

-- 
WebKit Debian packaging

