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

Wed Dec 22 16:13:55 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit ecd00ec0a220d8f683c117f6cce34aafa3f5c26e
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 21:52:06 2010 +0000

    2010-11-19  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Test for https://bugs.webkit.org/show_bug.cgi?id=49693
    
            * fast/loader/subresource-willSendRequest-null-expected.txt: Added.
            * fast/loader/subresource-willSendRequest-null.html: Added.
    2010-11-19  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Remove requests from ResourceLoadScheduler's queue before
            actually starting them.  We're holding a RefPtr anyway, and
            the load might be terminated and removed from the queue synchronously.
            https://bugs.webkit.org/show_bug.cgi?id=49693
    
            Test: fast/loader/subresource-willSendRequest-null.html
    
            * loader/ResourceLoadScheduler.cpp:
            (WebCore::ResourceLoadScheduler::servePendingRequests):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0920197..8722dd6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-19  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=49693
+
+        * fast/loader/subresource-willSendRequest-null-expected.txt: Added.
+        * fast/loader/subresource-willSendRequest-null.html: Added.
+
 2010-11-18  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/LayoutTests/fast/loader/subresource-willSendRequest-null-expected.txt b/LayoutTests/fast/loader/subresource-willSendRequest-null-expected.txt
new file mode 100644
index 0000000..4723b7f
--- /dev/null
+++ b/LayoutTests/fast/loader/subresource-willSendRequest-null-expected.txt
@@ -0,0 +1,2 @@
+https://bugs.webkit.org/show_bug.cgi?id=49693
+Ensure loads that go through our scheduler and are cancelled by willSendRequest() don't cause us to crash. 
diff --git a/LayoutTests/fast/loader/subresource-willSendRequest-null.html b/LayoutTests/fast/loader/subresource-willSendRequest-null.html
new file mode 100644
index 0000000..3d2ce7e
--- /dev/null
+++ b/LayoutTests/fast/loader/subresource-willSendRequest-null.html
@@ -0,0 +1,15 @@
+<html>
+<body>
+https://bugs.webkit.org/show_bug.cgi?id=49693<br>
+Ensure loads that go through our scheduler and are cancelled by willSendRequest() don't cause us to crash.
+<script>
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.setWillSendRequestReturnsNull(true);
+    }
+    var img = new Image(1, 1);
+    document.getElementsByTagName("body")[0].appendChild(img);
+    img.src = "does-not-exist.html";
+</script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e0006ad..0ab40f4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-19  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove requests from ResourceLoadScheduler's queue before
+        actually starting them.  We're holding a RefPtr anyway, and
+        the load might be terminated and removed from the queue synchronously.
+        https://bugs.webkit.org/show_bug.cgi?id=49693
+
+        Test: fast/loader/subresource-willSendRequest-null.html
+
+        * loader/ResourceLoadScheduler.cpp:
+        (WebCore::ResourceLoadScheduler::servePendingRequests):
+
 2010-11-18  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/loader/ResourceLoadScheduler.cpp b/WebCore/loader/ResourceLoadScheduler.cpp
index 80bea97..65d766b 100644
--- a/WebCore/loader/ResourceLoadScheduler.cpp
+++ b/WebCore/loader/ResourceLoadScheduler.cpp
@@ -191,10 +191,9 @@ void ResourceLoadScheduler::servePendingRequests(HostInformation* host, Priority
             if (shouldLimitRequests && host->limitRequests())
                 return;
 
-            resourceLoader->start();
-            if (!resourceLoader->reachedTerminalState())
-                host->addLoadInProgress(resourceLoader.get());
             requestsPending.removeFirst();
+            host->addLoadInProgress(resourceLoader.get());
+            resourceLoader->start();
         }
     }
 }

-- 
WebKit Debian packaging

