[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3f8c5af4de1212630f91f6e620bf9f18f441ed3a
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 01:28:44 2009 +0000

    2009-10-19  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Move sendRemainingDelegateMessages to ResourceLoadNotifier
            https://bugs.webkit.org/show_bug.cgi?id=30531
    
            This method is about notifying folks and doesn't interact with the rest
            of FrameLoader.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::willLoadMediaElementURL):
            (WebCore::FrameLoader::commitProvisionalLoad):
            (WebCore::FrameLoader::loadResourceSynchronously):
            (WebCore::FrameLoader::loadedResourceFromMemoryCache):
            * loader/FrameLoader.h:
            * loader/ResourceLoadNotifier.cpp:
            (WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
            * loader/ResourceLoadNotifier.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 150313b..dcd6fef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,26 @@
 
         Reviewed by Eric Seidel.
 
+        Move sendRemainingDelegateMessages to ResourceLoadNotifier
+        https://bugs.webkit.org/show_bug.cgi?id=30531
+
+        This method is about notifying folks and doesn't interact with the rest
+        of FrameLoader.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::willLoadMediaElementURL):
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+        * loader/FrameLoader.h:
+        * loader/ResourceLoadNotifier.cpp:
+        (WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
+        * loader/ResourceLoadNotifier.h:
+
+2009-10-19  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Bypass popup blocker using click event
         https://bugs.webkit.org/show_bug.cgi?id=21501
 
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 449e9a6..2e48018 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2043,7 +2043,7 @@ bool FrameLoader::willLoadMediaElementURL(KURL& url)
     unsigned long identifier;
     ResourceError error;
     requestFromDelegate(request, identifier, error);
-    sendRemainingDelegateMessages(identifier, ResourceResponse(url, String(), -1, String(), String()), -1, error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, ResourceResponse(url, String(), -1, String(), String()), -1, error);
 
     url = request.url();
 
@@ -2411,7 +2411,7 @@ void FrameLoader::commitProvisionalLoad(PassRefPtr<CachedPage> prpCachedPage)
             // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
             // However, with today's computers and networking speeds, this won't happen in practice.
             // Could be an issue with a giant local file.
-            sendRemainingDelegateMessages(identifier, response, static_cast<int>(response.expectedContentLength()), error);
+            notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, static_cast<int>(response.expectedContentLength()), error);
         }
         
         pageCache()->remove(history()->currentItem());
@@ -3263,8 +3263,8 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
         }
 #endif
     }
-    
-    sendRemainingDelegateMessages(identifier, response, data.size(), error);
+
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.size(), error);
     return identifier;
 }
 
@@ -3478,20 +3478,6 @@ void FrameLoader::continueLoadAfterNewWindowPolicy(const ResourceRequest& reques
     mainFrame->loader()->loadWithNavigationAction(request, NavigationAction(), false, FrameLoadTypeStandard, formState);
 }
 
-void FrameLoader::sendRemainingDelegateMessages(unsigned long identifier, const ResourceResponse& response, int length, const ResourceError& error)
-{    
-    if (!response.isNull())
-        notifier()->dispatchDidReceiveResponse(m_documentLoader.get(), identifier, response);
-    
-    if (length > 0)
-        notifier()->dispatchDidReceiveContentLength(m_documentLoader.get(), identifier, length);
-    
-    if (error.isNull())
-        notifier()->dispatchDidFinishLoading(m_documentLoader.get(), identifier);
-    else
-        m_client->dispatchDidFailLoading(m_documentLoader.get(), identifier, error);
-}
-
 void FrameLoader::requestFromDelegate(ResourceRequest& request, unsigned long& identifier, ResourceError& error)
 {
     ASSERT(!request.isNull());
@@ -3541,7 +3527,7 @@ void FrameLoader::loadedResourceFromMemoryCache(const CachedResource* resource)
     unsigned long identifier;
     ResourceError error;
     requestFromDelegate(request, identifier, error);
-    sendRemainingDelegateMessages(identifier, resource->response(), resource->encodedSize(), error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), resource->encodedSize(), error);
 }
 
 void FrameLoader::applyUserAgent(ResourceRequest& request)
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index c4a8ff7..bf0eebc 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -403,7 +403,6 @@ private:
 
     bool shouldReload(const KURL& currentURL, const KURL& destinationURL);
 
-    void sendRemainingDelegateMessages(unsigned long identifier, const ResourceResponse&, int length, const ResourceError&);
     void requestFromDelegate(ResourceRequest&, unsigned long& identifier, ResourceError&);
 
     void recursiveCheckLoadComplete();
diff --git a/WebCore/loader/ResourceLoadNotifier.cpp b/WebCore/loader/ResourceLoadNotifier.cpp
index 2cd51d1..7c1aa40 100644
--- a/WebCore/loader/ResourceLoadNotifier.cpp
+++ b/WebCore/loader/ResourceLoadNotifier.cpp
@@ -165,6 +165,20 @@ void ResourceLoadNotifier::dispatchDidFinishLoading(DocumentLoader* loader, unsi
 #endif
 }
 
+void ResourceLoadNotifier::sendRemainingDelegateMessages(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& response, int length, const ResourceError& error)
+{
+    if (!response.isNull())
+        dispatchDidReceiveResponse(loader, identifier, response);
+
+    if (length > 0)
+        dispatchDidReceiveContentLength(loader, identifier, length);
+
+    if (error.isNull())
+        dispatchDidFinishLoading(loader, identifier);
+    else
+        m_frame->loader()->client()->dispatchDidFailLoading(loader, identifier, error);
+}
+
 DocumentLoader* ResourceLoadNotifier::activeDocumentLoader() const
 {
     return m_frame->loader()->activeDocumentLoader();
diff --git a/WebCore/loader/ResourceLoadNotifier.h b/WebCore/loader/ResourceLoadNotifier.h
index 605d3e4..2d9412c 100644
--- a/WebCore/loader/ResourceLoadNotifier.h
+++ b/WebCore/loader/ResourceLoadNotifier.h
@@ -64,6 +64,8 @@ public:
     void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int length);
     void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier);
 
+    void sendRemainingDelegateMessages(DocumentLoader*, unsigned long identifier, const ResourceResponse&, int length, const ResourceError&);
+
 private:
     inline DocumentLoader* activeDocumentLoader() const;
 

-- 
WebKit Debian packaging