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

[japhet at chromium.org]

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

    2010-11-08  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Adam Barth.
    
            Call ApplicationCacheHost::maybeLoadResource() in
            ResourceLoader::start() instead of ResourceLoader::load().
            maybeLoadResource() might mutate the ResourceRequest, and
            in its current location any modifications are lost.
    
            https://bugs.webkit.org/show_bug.cgi?id=49221
    
            Fixes a couple of http/tests/appcache tests
            failing on chromium.
    
            * loader/ResourceLoader.cpp:
            (WebCore::ResourceLoader::load):
            (WebCore::ResourceLoader::start):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71606 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a86cb4..85eb7ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-08  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Call ApplicationCacheHost::maybeLoadResource() in
+        ResourceLoader::start() instead of ResourceLoader::load().
+        maybeLoadResource() might mutate the ResourceRequest, and
+        in its current location any modifications are lost.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49221
+
+        Fixes a couple of http/tests/appcache tests
+        failing on chromium.
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::load):
+        (WebCore::ResourceLoader::start):
+
 2010-11-08  Chang Shu  <chang.shu at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index 08b3877..56a169b 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -133,11 +133,6 @@ bool ResourceLoader::load(const ResourceRequest& r)
         didFail(frameLoader()->cancelledError(r));
         return false;
     }
-    
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, clientRequest, r.url()))
-        return true;
-#endif
 
     if (m_defersLoading)
         m_deferredRequest = clientRequest;
@@ -154,6 +149,11 @@ bool ResourceLoader::start()
     
     if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url()))
         return true;
+    
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_request, m_request.url()))
+        return true;
+#endif
 
     if (m_defersLoading)
         return false;

-- 
WebKit Debian packaging