Changeset 49829 in webkit

Timestamp:

Oct 19, 2009 6:29:51 PM (15 years ago)

Author:

abarth@webkit.org

Message:

2009-10-19 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Remove ResourceLoadNotifier::activeDocumentLoader
​https://bugs.webkit.org/show_bug.cgi?id=30533

Removing this method from ResourceLoadNotifier better decouples the
notifier from FrameLoader.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::continueLoadAfterWillSubmitForm): (WebCore::FrameLoader::requestFromDelegate):
• loader/ResourceLoadNotifier.cpp: (WebCore::ResourceLoadNotifier::didReceiveResponse):
• loader/ResourceLoadNotifier.h:
• loader/ResourceLoader.cpp: (WebCore::ResourceLoader::willSendRequest):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/ResourceLoadNotifier.cpp (modified) (4 diffs)
• loader/ResourceLoadNotifier.h (modified) (3 diffs)
• loader/ResourceLoader.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-19  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove ResourceLoadNotifier::activeDocumentLoader
+        https://bugs.webkit.org/show_bug.cgi?id=30533
+
+        Removing this method from ResourceLoadNotifier better decouples the
+        notifier from FrameLoader.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::continueLoadAfterWillSubmitForm):
+        (WebCore::FrameLoader::requestFromDelegate):
+        * loader/ResourceLoadNotifier.cpp:
+        (WebCore::ResourceLoadNotifier::didReceiveResponse):
+        * loader/ResourceLoadNotifier.h:
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::willSendRequest):
+
 2009-10-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2949 +2949 @@
     if (Page* page = m_frame->page()) {
         identifier = page->progress()->createUniqueIdentifier();
-        notifier()->dispatchAssignIdentifierToInitialRequest(identifier, m_provisionalDocumentLoader.get(), m_provisionalDocumentLoader->originalRequest());
+        notifier()->assignIdentifierToInitialRequest(identifier, m_provisionalDocumentLoader.get(), m_provisionalDocumentLoader->originalRequest());
     }
 
@@ -3486 +3486 @@
     if (Page* page = m_frame->page()) {
         identifier = page->progress()->createUniqueIdentifier();
-        notifier()->dispatchAssignIdentifierToInitialRequest(identifier, m_documentLoader.get(), request);
+        notifier()->assignIdentifierToInitialRequest(identifier, m_documentLoader.get(), request);
     }
 

trunk/WebCore/loader/ResourceLoadNotifier.cpp

@@ -58 +58 @@
 }
 
-void ResourceLoadNotifier::assignIdentifierToInitialRequest(unsigned long identifier, const ResourceRequest& clientRequest)
-{
-    dispatchAssignIdentifierToInitialRequest(identifier, activeDocumentLoader(), clientRequest);
-}
-
 void ResourceLoadNotifier::willSendRequest(ResourceLoader* loader, ResourceRequest& clientRequest, const ResourceResponse& redirectResponse)
 {
@@ -72 +67 @@
 void ResourceLoadNotifier::didReceiveResponse(ResourceLoader* loader, const ResourceResponse& r)
 {
-    activeDocumentLoader()->addResponse(r);
+    loader->documentLoader()->addResponse(r);
 
     if (Page* page = m_frame->page())
@@ -109 +104 @@
 }
 
-void ResourceLoadNotifier::dispatchAssignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
+void ResourceLoadNotifier::assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
 {
     m_frame->loader()->client()->assignIdentifierToInitialRequest(identifier, loader, request);
@@ -180 +175 @@
 }
 
-DocumentLoader* ResourceLoadNotifier::activeDocumentLoader() const
-{
-    return m_frame->loader()->activeDocumentLoader();
-}
-
 } // namespace WebCore

trunk/WebCore/loader/ResourceLoadNotifier.h

@@ -51 +51 @@
     void didCancelAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
 
-    void assignIdentifierToInitialRequest(unsigned long identifier, const ResourceRequest&);
     void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
     void didReceiveResponse(ResourceLoader*, const ResourceResponse&);
@@ -59 +58 @@
     void didLoadResourceByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString);
 
-    void dispatchAssignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
+    void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
     void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
     void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&);
@@ -68 +67 @@
 
 private:
-    inline DocumentLoader* activeDocumentLoader() const;
-
     Frame* m_frame;
 };

trunk/WebCore/loader/ResourceLoader.cpp

@@ -198 +198 @@
     // anything including possibly derefing this; one example of this is Radar 3266216.
     RefPtr<ResourceLoader> protector(this);
-        
+
     ASSERT(!m_reachedTerminalState);
 
@@ -204 +204 @@
         if (!m_identifier) {
             m_identifier = m_frame->page()->progress()->createUniqueIdentifier();
-            frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifier, request);
+            frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifier, documentLoader(), request);
         }
 
         frameLoader()->notifier()->willSendRequest(this, request, redirectResponse);
     }
-    
+
     m_request = request;
 }