commit 2dbcee8371de9952c507917ad5471753e74030fe
author andersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 07 19:31:55 2007 +0000
committer andersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 07 19:31:55 2007 +0000
tree 84b029f78dba5983141f1851ba84059c191a4da3
parent c5f579e4c5ef84dedc7027ac36f306225226e53e

WebCore:

        Reviewed by Brady.

        Remove some methods in FrameLoader that just calls down to the active document loader. Since each
        resource loader now has a pointer to its document loader, we can just call directly to the
        document loader.

        * WebCore.exp:
        * loader/FrameLoader.cpp:
        * loader/FrameLoader.h:
        * loader/MainResourceLoader.cpp:
        (WebCore::MainResourceLoader::willSendRequest):
        (WebCore::MainResourceLoader::didReceiveResponse):
        * loader/SubresourceLoader.cpp:
        (WebCore::SubresourceLoader::SubresourceLoader):
        (WebCore::SubresourceLoader::didFinishLoading):
        (WebCore::SubresourceLoader::didFail):
        (WebCore::SubresourceLoader::didCancel):
        * loader/mac/NetscapePlugInStreamLoaderMac.mm:
        (WebCore::NetscapePlugInStreamLoader::didFinishLoading):
        (WebCore::NetscapePlugInStreamLoader::didFail):
        (WebCore::NetscapePlugInStreamLoader::didCancel):

WebKit:

        Reviewed by Brady.

        Update to match WebCore.
        
        * Plugins/WebNetscapePluginStream.mm:
        (-[WebNetscapePluginStream start]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/loader/MainResourceLoader.cpp

diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index 23d1f67..affa66e 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -29,6 +29,7 @@
 #include "config.h"
 #include "MainResourceLoader.h"
 
+#include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
@@ -162,7 +163,7 @@
     }
     
     // Don't set this on the first request. It is set when the main load was started.
-    frameLoader()->setRequest(newRequest);
+    m_documentLoader->setRequest(newRequest);
     
     ref(); // balanced by deref in continueAfterNavigationPolicy
     frameLoader()->checkNavigationPolicy(newRequest, callContinueAfterNavigationPolicy, this);
@@ -265,7 +266,7 @@
     // reference to this object; one example of this is 3266216.
     RefPtr<MainResourceLoader> protect(this);
 
-    frameLoader()->setResponse(r);
+    m_documentLoader->setResponse(r);
 
     m_response = r;