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

Wed Apr 7 23:32:21 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit cddb293c2091da338f901f5c6dbc98ae404bdd89
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 23:56:07 2009 +0000

    2009-11-11  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Dmitri Titov.
    
            Fix layout test to not call onload on the wrong window after image has
            been dropped onto the iframe.
            https://bugs.webkit.org/show_bug.cgi?id=30893
    
            * editing/selection/drag-to-contenteditable-iframe.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 732d7ee..d7d8d01 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-11  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Dmitri Titov.
+
+        Fix layout test to not call onload on the wrong window after image has
+        been dropped onto the iframe.
+        https://bugs.webkit.org/show_bug.cgi?id=30893
+
+        * editing/selection/drag-to-contenteditable-iframe.html:
+
 2009-11-11  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/LayoutTests/editing/selection/drag-to-contenteditable-iframe.html b/LayoutTests/editing/selection/drag-to-contenteditable-iframe.html
index a19c715..1c9a7e7 100644
--- a/LayoutTests/editing/selection/drag-to-contenteditable-iframe.html
+++ b/LayoutTests/editing/selection/drag-to-contenteditable-iframe.html
@@ -6,7 +6,6 @@ if (window.layoutTestController) {
      layoutTestController.waitUntilDone();
 }
 
-var loadedResources = 0;
 function log(message) {
     var console = document.getElementById("console");
     var li = document.createElement("li");
@@ -16,16 +15,7 @@ function log(message) {
     li.appendChild(text);
 }
 
-function runTest() {     
-   // We need to wait for both the image and the iframe to load.
-   loadedResources++;
-   if (loadedResources == 2) {
-     step2();
-   }
-}
-
-function step2() 
-{
+function runTest() {
     if (!window.layoutTestController) {
         log("This test uses the eventSender.  To run it manually, drag the image into the editable frame and drop it.  It should appear inside the editable frame.");
         return;
@@ -50,13 +40,16 @@ function step2()
     
     layoutTestController.notifyDone();
 }
+
+window.onload = runTest;
+
 </script>
 </head>
 
 <body style="padding:0; margin:0">  
 
-<iframe id="frame" style="width: 200px; height: 200px; border: 4px solid black;" src="../resources/contenteditable-iframe-src.html" onload="runTest();"></iframe>
-<img id="dragme" src="../resources/abe.png" onload="runTest();">
+<iframe id="frame" style="width: 200px; height: 200px; border: 4px solid black;" src="../resources/contenteditable-iframe-src.html"></iframe>
+<img id="dragme" src="../resources/abe.png">
 
 <ul id="console"></ul>
 </body>

-- 
WebKit Debian packaging

