[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

aestes at apple.com aestes at apple.com
Sun Feb 20 22:50:31 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit f6b10254c88fffcd500407f105770980ef9690f5
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 01:57:36 2011 +0000

    2011-01-11  Andy Estes  <aestes at apple.com>
    
            Reviewed by Darin Adler.
    
            REGRESSION (r71562): servePendingRequests() no longer called when
            resources are done loading.
            https://bugs.webkit.org/show_bug.cgi?id=52264
            <rdar://problem/8767429>
    
            In r71562, servePendingRequests() is no longer called in Loader's
            didFinishLoading(), didFail() and didReceiveResponse() methods. Since
            r71562 was intended only as a refactoring, these calls should be
            restored. At least one WebKit-based Mac OS X application relies on this
            for correct behavior.
    
            * loader/cache/CachedResourceLoader.cpp:
            (WebCore::CachedResourceLoader::loadDone): Call
            resourceLoadScheduler()->servePendingRequests().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75580 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ab2adf0..e48b024 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-11  Andy Estes  <aestes at apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r71562): servePendingRequests() no longer called when
+        resources are done loading.
+        https://bugs.webkit.org/show_bug.cgi?id=52264
+        <rdar://problem/8767429>
+        
+        In r71562, servePendingRequests() is no longer called in Loader's
+        didFinishLoading(), didFail() and didReceiveResponse() methods. Since
+        r71562 was intended only as a refactoring, these calls should be
+        restored. At least one WebKit-based Mac OS X application relies on this
+        for correct behavior.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::loadDone): Call
+        resourceLoadScheduler()->servePendingRequests().
+
 2011-01-11  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 9f3c2c4..0ac3f4b 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -43,6 +43,7 @@
 #include "Logging.h"
 #include "MemoryCache.h"
 #include "PingLoader.h"
+#include "ResourceLoadScheduler.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include <wtf/text/CString.h>
@@ -522,6 +523,7 @@ void CachedResourceLoader::loadDone(CachedResourceRequest* request)
     if (frame())
         frame()->loader()->loadDone();
     checkForPendingPreloads();
+    resourceLoadScheduler()->servePendingRequests();
 }
 
 void CachedResourceLoader::cancelRequests()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list