Changeset 162981 in webkit

Timestamp:

Jan 28, 2014 4:39:42 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add WebDocumentLoader, a WebCore::DocumentLoader subclass
​https://bugs.webkit.org/show_bug.cgi?id=127817

Reviewed by Tim Horton.

We need a place to store navigation IDs, and since they are per document loader, putting them
in a DocumentLoader subclass seems like a good idea.

• WebKit2.xcodeproj/project.pbxproj:
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createDocumentLoader):

• WebProcess/WebPage/WebDocumentLoader.cpp: Added.

(WebKit::WebDocumentLoader::WebDocumentLoader):
(WebKit::WebDocumentLoader::setNavigationID):

• WebProcess/WebPage/WebDocumentLoader.h: Added.

(WebKit::WebDocumentLoader::create):
(WebKit::WebDocumentLoader::navigationID):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebKit2.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebDocumentLoader.cpp (added)
• WebProcess/WebPage/WebDocumentLoader.h (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-28  Anders Carlsson  <andersca@apple.com>
+
+        Add WebDocumentLoader, a WebCore::DocumentLoader subclass
+        https://bugs.webkit.org/show_bug.cgi?id=127817
+
+        Reviewed by Tim Horton.
+
+        We need a place to store navigation IDs, and since they are per document loader, putting them
+        in a DocumentLoader subclass seems like a good idea.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createDocumentLoader):
+        * WebProcess/WebPage/WebDocumentLoader.cpp: Added.
+        (WebKit::WebDocumentLoader::WebDocumentLoader):
+        (WebKit::WebDocumentLoader::setNavigationID):
+        * WebProcess/WebPage/WebDocumentLoader.h: Added.
+        (WebKit::WebDocumentLoader::create):
+        (WebKit::WebDocumentLoader::navigationID):
+
 2014-01-28  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -180 +180 @@
                 1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */; };
                 1A5B1C511898606F004FCF9B /* WKNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                1A5B1C5418987EDF004FCF9B /* WebDocumentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */; };
+                1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */; };
                 1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
                 1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
@@ -1808 +1810 @@
                 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigation.mm; sourceTree = "<group>"; };
                 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigation.h; sourceTree = "<group>"; };
+                1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
+                1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
                 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerState.h; sourceTree = "<group>"; };
                 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
@@ -4843 +4847 @@
                                 51871B59127CB89D00F76232 /* WebContextMenu.cpp */,
                                 51871B5A127CB89D00F76232 /* WebContextMenu.h */,
+                                1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */,
+                                1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */,
                                 BC111ADC112F5B9300337BAB /* WebFrame.cpp */,
                                 BC032D8910F437A00058C15A /* WebFrame.h */,
@@ -6085 +6091 @@
                                 BC032DA910F437D10058C15A /* Arguments.h in Headers */,
                                 BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */,
+                                1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */,
                                 E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */,
                                 51BA24441858EE3000EA2811 /* AsyncTask.h in Headers */,
@@ -7731 +7738 @@
                                 1A24BF3A120896A600FBB059 /* SharedMemoryMac.cpp in Sources */,
                                 5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */,
+                                1A5B1C5418987EDF004FCF9B /* WebDocumentLoader.cpp in Sources */,
                                 51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */,
                                 1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */,

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

@@ -39 +39 @@
 #include "WebContextMessages.h"
 #include "WebCoreArgumentCoders.h"
+#include "WebDocumentLoader.h"
 #include "WebErrors.h"
 #include "WebEvent.h"
@@ -1133 +1134 @@
 PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& data)
 {
-    return DocumentLoader::create(request, data);
+    return WebDocumentLoader::create(request, data);
 }