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

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit 17a2e4b79c722abd9dd541590db34bc8e93fe488
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 10:05:52 2010 +0000

    2010-09-15  Steve Block  <steveblock at google.com>
    
            Reviewed by Kent Tamura.
    
            LayoutTest fast/dom/Geolocation/clear-watch-invalid-id-crash.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=45783
    
            This test synchronously navigates the page to a new URL from its main script file.
            This navigation causes WebView.onPageFinished() to be called for the test page.
            The problem is that this may occur before js-test-post.js, which is included by the
            test and calls layoutTestController.waitUntilDone(), is loaded and parsed. As a
            result, the test is incorrectly deemed to have finished as soon as the navigation
            is started and the output will therefore be incorrect.
    
            This patch fixes the problem by initiating the page navigation from
            the onload handler, which is not fired until all resources have been
            loaded and parsed. This guarantees that WebView.onPageFinished() is
            not called until after layoutTestController.waitUntilDone() has been
            called.
    
            * fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b6db474..8728149 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-15  Steve Block  <steveblock at google.com>
+
+        Reviewed by Kent Tamura.
+
+        LayoutTest fast/dom/Geolocation/clear-watch-invalid-id-crash.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=45783
+
+        This test synchronously navigates the page to a new URL from its main script file.
+        This navigation causes WebView.onPageFinished() to be called for the test page.
+        The problem is that this may occur before js-test-post.js, which is included by the
+        test and calls layoutTestController.waitUntilDone(), is loaded and parsed. As a
+        result, the test is incorrectly deemed to have finished as soon as the navigation
+        is started and the output will therefore be incorrect.
+
+        This patch fixes the problem by initiating the page navigation from
+        the onload handler, which is not fired until all resources have been
+        loaded and parsed. This guarantees that WebView.onPageFinished() is
+        not called until after layoutTestController.waitUntilDone() has been
+        called.
+
+        * fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js:
+
 2010-09-15  Renata Hodovan  <reni at inf.u-szeged.hu>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js b/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js
index 6176da0..0f9cb58 100644
--- a/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js
+++ b/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js
@@ -6,9 +6,11 @@ if (window.layoutTestController) {
 } else
     debug('This test can not be run without the LayoutTestController');
 
-navigator.geolocation.watchPosition(function() {});
-navigator.geolocation.clearWatch(0);
-location = "data:text/html,TEST COMPLETE<script>layoutTestController.notifyDone();</script>";
+document.body.onload = function() {
+    navigator.geolocation.watchPosition(function() {});
+    navigator.geolocation.clearWatch(0);
+    location = "data:text/html,TEST COMPLETE<script>if(window.layoutTestController) layoutTestController.notifyDone();</script>";
+}
 
 window.jsTestIsAsync = true;
 window.successfullyParsed = true;

-- 
WebKit Debian packaging