Changeset 162990 in webkit

Timestamp:

Jan 28, 2014 5:39:32 PM (10 years ago)

Author:

andersca@apple.com

Message:

WebPage should be in charge of creating document loaders
​https://bugs.webkit.org/show_bug.cgi?id=127818

Reviewed by Dan Bernstein.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createDocumentLoader):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::createDocumentLoader):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-28  Anders Carlsson  <andersca@apple.com>
+
+        WebPage should be in charge of creating document loaders
+        https://bugs.webkit.org/show_bug.cgi?id=127818
+
+        Reviewed by Dan Bernstein.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createDocumentLoader):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::createDocumentLoader):
+        * WebProcess/WebPage/WebPage.h:
+
 2014-01-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -39 +39 @@
 #include "WebContextMessages.h"
 #include "WebCoreArgumentCoders.h"
-#include "WebDocumentLoader.h"
 #include "WebErrors.h"
 #include "WebEvent.h"
@@ -953 +952 @@
     if (!shouldGoToBackForwardListItem)
         return false;
-    
+
     webPage->send(Messages::WebPageProxy::WillGoToBackForwardListItem(itemID, InjectedBundleUserMessageEncoder(userData.get())));
     return true;
@@ -1132 +1131 @@
 }
 
-PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& data)
-{
-    return WebDocumentLoader::create(request, data);
+PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData)
+{
+    return m_frame->page()->createDocumentLoader(*m_frame->coreFrame(), request, substituteData);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -62 +62 @@
 #include "WebContextMessages.h"
 #include "WebCoreArgumentCoders.h"
+#include "WebDocumentLoader.h"
 #include "WebDragClient.h"
 #include "WebEditorClient.h"
@@ -4164 +4165 @@
 }
 
+PassRefPtr<DocumentLoader> WebPage::createDocumentLoader(Frame& frame, const ResourceRequest& request, const SubstituteData& substituteData)
+{
+    RefPtr<WebDocumentLoader> documentLoader = WebDocumentLoader::create(request, substituteData);
+
+    // FIXME: Set the navigation ID if possible.
+
+    return documentLoader.release();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -123 +123 @@
     class ResourceRequest;
     class SharedBuffer;
+    class SubstituteData;
     class TextCheckingRequest;
     class VisibleSelection;
@@ -690 +691 @@
     WKTypeRef pageOverlayCopyAccessibilityAttributeValue(WKStringRef attribute, WKTypeRef parameter);
     WKArrayRef pageOverlayCopyAccessibilityAttributesNames(bool parameterizedNames);
-    
+
+    PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame&, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
+
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);