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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f94d5fa16e575a1f6e98d68f70ecb2f4cbb137fc
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 21:22:41 2010 +0000

    2010-09-10  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Adam Roben.
    
            compositing/iframes/iframe-src-change.html test fails on Windows
            https://bugs.webkit.org/show_bug.cgi?id=45554
    
            This test had the wrong behavior. It never actually entered compositing mode.
            Now give it a chance to do so (and test for it), and then test that the layers
            disappeared.
    
            * compositing/iframes/iframe-src-change-expected.txt:
            * compositing/iframes/iframe-src-change.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a4d8658..8d1aa6a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-10  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Adam Roben.
+
+        compositing/iframes/iframe-src-change.html test fails on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=45554
+        
+        This test had the wrong behavior. It never actually entered compositing mode.
+        Now give it a chance to do so (and test for it), and then test that the layers
+        disappeared.
+
+        * compositing/iframes/iframe-src-change-expected.txt:
+        * compositing/iframes/iframe-src-change.html:
+
 2010-09-10  Adam Roben  <aroben at apple.com>
 
         Give expected results files the right names
diff --git a/LayoutTests/compositing/iframes/iframe-src-change-expected.txt b/LayoutTests/compositing/iframes/iframe-src-change-expected.txt
index 91cce39..1200269 100644
--- a/LayoutTests/compositing/iframes/iframe-src-change-expected.txt
+++ b/LayoutTests/compositing/iframes/iframe-src-change-expected.txt
@@ -1,4 +1,4 @@
 
 The iframe content was removed. There should be no layers here.
 
-
+PASS: layers disappeared when iframe source changed.
diff --git a/LayoutTests/compositing/iframes/iframe-src-change.html b/LayoutTests/compositing/iframes/iframe-src-change.html
index f77e546..47a2640 100644
--- a/LayoutTests/compositing/iframes/iframe-src-change.html
+++ b/LayoutTests/compositing/iframes/iframe-src-change.html
@@ -30,14 +30,33 @@
 
     function doTest()
     {
-        if (window.layoutTestController)
-            layoutTestController.display();
+        // For some reason this delay is required for AppKit to not short-circuit the display.
+        window.setTimeout(function() {
+            var hadLayersBefore = false;
+            var hadLayersAfter = false;
+            if (window.layoutTestController) {
+                layoutTestController.display(); // Need to paint for overlap testing.
+                hadLayersBefore = layoutTestController.layerTreeAsText() != "";
+            }
 
-        document.getElementById('parent-iframe').src = "about:blank";
-        if (window.layoutTestController) {
-            document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
-        }
+            document.getElementById('parent-iframe').src = "about:blank";
+            
+            window.setTimeout(function() {
+                if (window.layoutTestController) {
+                    hadLayersAfter = layoutTestController.layerTreeAsText() != "";
+
+                    var results = document.getElementById('results');
+                    if (hadLayersBefore && !hadLayersAfter)
+                        results.innerText = "PASS: layers disappeared when iframe source changed."
+                    else if (!hadLayersBefore)
+                        results.innerText = "FAIL: should have initially had layers, but did not."
+                    else if (hadLayersAfter)
+                        results.innerText = "FAIL: layers did not disappear when iframe source changed."
+
+                    layoutTestController.notifyDone();
+                }
+            }, 0);
+        }, 0);
     }
     
     window.addEventListener('load', doTest, false);
@@ -51,6 +70,6 @@
     </div>
 
     <p>The iframe content was removed. There should be no layers here.</p>
-    <pre id="layers">Layer tree appears here in DRT.</pre>
+    <p id="results">This test needs to be run in DRT.</p>
 </body>
 </html>

-- 
WebKit Debian packaging