Changeset 49828 in webkit

Timestamp:

Oct 19, 2009 6:28:44 PM (15 years ago)

Author:

abarth@webkit.org

Message:

2009-10-19 Adam Barth <​abarth@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (5 diffs)
• loader/FrameLoader.h (modified) (1 diff)
• loader/ResourceLoadNotifier.cpp (modified) (1 diff)
• loader/ResourceLoadNotifier.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-19  Adam Barth  <abarth@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:
+
 2009-10-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2044 +2044 @@
     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();
@@ -2412 +2412 @@
             // 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);
         }
         
@@ -3264 +3264 @@
 #endif
     }
-    
-    sendRemainingDelegateMessages(identifier, response, data.size(), error);
+
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.size(), error);
     return identifier;
 }
@@ -3479 +3479 @@
 }
 
-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)
 {
@@ -3542 +3528 @@
     ResourceError error;
     requestFromDelegate(request, identifier, error);
-    sendRemainingDelegateMessages(identifier, resource->response(), resource->encodedSize(), error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), resource->encodedSize(), error);
 }
 

trunk/WebCore/loader/FrameLoader.h

@@ -404 +404 @@
     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&);
 

trunk/WebCore/loader/ResourceLoadNotifier.cpp

@@ -166 +166 @@
 }
 
+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
 {

trunk/WebCore/loader/ResourceLoadNotifier.h

@@ -65 +65 @@
     void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier);
 
+    void sendRemainingDelegateMessages(DocumentLoader*, unsigned long identifier, const ResourceResponse&, int length, const ResourceError&);
+
 private:
     inline DocumentLoader* activeDocumentLoader() const;