Reviewed by Darin.

        - wean WebFrameLoader from WebDataSource private stuff

        (actually just tweaks tot he above to make merging my future
        patches easier since Darin did a lot of the same stuff)

        * Loader/WebDocumentLoader.h:
        * Loader/WebDocumentLoader.m:
        (-[WebDocumentLoader URLForHistory]):
        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader _loadRequest:archive:]):
        (-[WebFrameLoader revertToProvisionalWithDocumentLoader:]):
        (-[WebFrameLoader documentLoader:setMainDocumentError:]):
        (-[WebFrameLoader finalSetupForReplaceWithDocumentLoader:]):
        (-[WebFrameLoader didChangeTitleForDocument:]):
        (-[WebFrameLoader loadDocumentLoader:withLoadType:formState:]):
        * Loader/WebFrameLoaderClient.h:
        * WebView/WebDataSource.m:
        (-[WebDataSource _URLForHistory]):
        * WebView/WebFrame.m:
        (-[WebFrame _addDocumentLoader:toUnarchiveState:]):
        (-[WebFrame _revertToProvisionalStateForDocumentLoader:]):
        (-[WebFrame _setMainDocumentError:forDocumentLoader:]):
        (-[WebFrame _clearUnarchivingStateForLoader:]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c8802a6ea78862f378c6af5b87014f963a7b7fbc..db427abb466f51fb9c8effa1d1082d8aa1535fbe 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,31 @@
+2006-10-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+        
+        - wean WebFrameLoader from WebDataSource private stuff
+        
+        (actually just tweaks tot he above to make merging my future
+        patches easier since Darin did a lot of the same stuff)
+
+        * Loader/WebDocumentLoader.h:
+        * Loader/WebDocumentLoader.m:
+        (-[WebDocumentLoader URLForHistory]):
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader _loadRequest:archive:]):
+        (-[WebFrameLoader revertToProvisionalWithDocumentLoader:]):
+        (-[WebFrameLoader documentLoader:setMainDocumentError:]):
+        (-[WebFrameLoader finalSetupForReplaceWithDocumentLoader:]):
+        (-[WebFrameLoader didChangeTitleForDocument:]):
+        (-[WebFrameLoader loadDocumentLoader:withLoadType:formState:]):
+        * Loader/WebFrameLoaderClient.h:
+        * WebView/WebDataSource.m:
+        (-[WebDataSource _URLForHistory]):
+        * WebView/WebFrame.m:
+        (-[WebFrame _addDocumentLoader:toUnarchiveState:]):
+        (-[WebFrame _revertToProvisionalStateForDocumentLoader:]):
+        (-[WebFrame _setMainDocumentError:forDocumentLoader:]):
+        (-[WebFrame _clearUnarchivingStateForLoader:]):
+
 2006-10-09  Darin Adler  <darin@apple.com>
 
         Reviewed by Brady.
@@ -147,9 +175,10 @@
 
 2006-10-09  Maciej Stachowiak  <mjs@apple.com>
 
+>>>>>>> .r16935
         Reviewed by Alice.
 
-        - moved WebFormState into Loader directory and tweaked to void WebKit dependencies
+        - moved WebFormState into Loader directory and tweaked to avoid WebKit dependencies
         
         * Loader/WebDocumentLoader.h:
         * Loader/WebFormState.h: Added.

diff --git a/WebKit/Loader/WebDocumentLoader.h b/WebKit/Loader/WebDocumentLoader.h
index fe1e7dd36b72991d60e627c7a0ef9657e86a5bf1..570524ba399dd658d879e6a0933e5cb3f526c714 100644 (file)
--- a/WebKit/Loader/WebDocumentLoader.h
+++ b/WebKit/Loader/WebDocumentLoader.h
@@ -139,5 +139,6 @@
 - (NSURLRequest *)lastCheckedRequest;
 - (void)stopRecordingResponses;
 - (NSString *)title;
+- (NSURL *)URLForHistory;
 
 @end

diff --git a/WebKit/Loader/WebDocumentLoader.m b/WebKit/Loader/WebDocumentLoader.m
index 4184beb2b7644ad4fc0eaaf40bf4a28f2550fe8e..daf9a6818d1451e31a936ad91bd769bee7dca628 100644 (file)
--- a/WebKit/Loader/WebDocumentLoader.m
+++ b/WebKit/Loader/WebDocumentLoader.m
@@ -520,4 +520,16 @@
     [trimmed release];
 }
 
+- (NSURL *)URLForHistory
+{
+    // Return the URL to be used for history and B/F list.
+    // Returns nil for WebDataProtocol URLs that aren't alternates 
+    // for unreachable URLs, because these can't be stored in history.
+    NSURL *URL = [originalRequestCopy URL];
+    if ([WebDataProtocol _webIsDataProtocolURL:URL])
+        URL = [originalRequestCopy _webDataRequestUnreachableURL];
+
+    return URL;
+}
+
 @end

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index 536b3257c0b3b9fda73e24d97efec0ee9c868e0e..16c90d6b46410ee7852d8b66c7493476e680507e 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -1195,12 +1195,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)revertToProvisionalWithDocumentLoader:(WebDocumentLoader *)loader
 {
-    [client _revertToProvisionalWithDocumentLoader:loader];
+    [client _revertToProvisionalStateForDocumentLoader:loader];
 }
 
 - (void)documentLoader:(WebDocumentLoader *)loader setMainDocumentError:(NSError *)error
 {
-    [client _documentLoader:loader setMainDocumentError:error];
+    [client _setMainDocumentError:error forDocumentLoader:loader];
 }
 
 - (void)documentLoader:(WebDocumentLoader *)loader mainReceivedCompleteError:(NSError *)error
@@ -1212,7 +1212,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)finalSetupForReplaceWithDocumentLoader:(WebDocumentLoader *)loader
 {
-    [client _finalSetupForReplaceWithDocumentLoader:loader];
+    [client _clearUnarchivingStateForLoader:loader];
 }
 
 - (void)prepareForLoadStart
@@ -1241,7 +1241,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
     // The title doesn't get communicated to the WebView until we are committed.
     if ([loader isCommitted]) {
-        NSURL *URLForHistory = [client _URLForHistoryForDocumentLoader:loader];
+        NSURL *URLForHistory = [[loader URLForHistory] _webkit_canonicalize];
         if (URLForHistory != nil) {
             // Must update the entries in the back-forward list too.
             // This must go through the WebFrame because it has the right notion of the current b/f item.

diff --git a/WebKit/Loader/WebFrameLoaderClient.h b/WebKit/Loader/WebFrameLoaderClient.h
index 3f959e8c6f77926412f0067386355d6bf74cfe8f..350c9ca66c4bc4bf7149855c2b1043f9f6e3cc98 100644 (file)
--- a/WebKit/Loader/WebFrameLoaderClient.h
+++ b/WebKit/Loader/WebFrameLoaderClient.h
@@ -113,7 +113,11 @@ typedef struct LoadErrorResetToken LoadErrorResetToken;
 
 - (void)_dispatchDidLoadMainResourceForDocumentLoader:(WebDocumentLoader *)loader;
 - (void)_clearLoadingFromPageCacheForDocumentLoader:(WebDocumentLoader *)loader;
-- (BOOL)_isDocumentLoaderLoadingFromPageCache:(WebDocumentLoader *)documentLoader;
+- (BOOL)_isDocumentLoaderLoadingFromPageCache:(WebDocumentLoader *)loader;
+- (void)_addDocumentLoader:(WebDocumentLoader *)loader toUnarchiveState:(WebArchive *)archive;
+- (void)_revertToProvisionalStateForDocumentLoader:(WebDocumentLoader *)loader;
+- (void)_setMainDocumentError:(NSError *)error forDocumentLoader:(WebDocumentLoader *)loader;
+- (void)_clearUnarchivingStateForLoader:(WebDocumentLoader *)loader;
 
 - (void)_progressStarted;
 - (void)_progressCompleted;
@@ -129,12 +133,10 @@ typedef struct LoadErrorResetToken LoadErrorResetToken;
 - (void)_willChangeTitleForDocument:(WebDocumentLoader *)loader;
 - (void)_didChangeTitleForDocument:(WebDocumentLoader *)loader;
 
-- (void)_revertToProvisionalWithDocumentLoader:(WebDocumentLoader *)loader;
 - (void)_committedLoadWithDocumentLoader:(WebDocumentLoader *)loader data:(NSData *)data;
 - (void)_finishedLoadingDocument:(WebDocumentLoader *)loader;
 - (void)_documentLoader:(WebDocumentLoader *)loader setMainDocumentError:(NSError *)error;
 - (void)_finalSetupForReplaceWithDocumentLoader:(WebDocumentLoader *)loader;
-- (NSURL *)_URLForHistoryForDocumentLoader:(WebDocumentLoader *)loader;
 
 - (NSError *)_cancelledErrorWithRequest:(NSURLRequest *)request;
 - (NSError *)_cannotShowURLErrorWithRequest:(NSURLRequest *)request;

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index 18a1169917097f0d3b0634a5e37f18899f38dd88..a4f556da4cc646685f695dc430fd1215cbe65c15 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -334,14 +334,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
 
 - (NSURL *)_URLForHistory
 {
-    // Return the URL to be used for history and B/F list.
-    // Returns nil for WebDataProtocol URLs that aren't alternates 
-    // for unreachable URLs, because these can't be stored in history.
-    NSURL *URL = [[_private->loader originalRequestCopy] URL];
-    if ([WebDataProtocol _webIsDataProtocolURL:URL])
-        URL = [[_private->loader originalRequestCopy] _webDataRequestUnreachableURL];
-    
-    return [URL _webkit_canonicalize];
+    return [[_private->loader URLForHistory] _webkit_canonicalize];
 }
 
 - (void)_addToUnarchiveState:(WebArchive *)archive

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index 282968e7f812c154a48f41ad78f20bf5906f7f24..d0182d2487cb5e959f3c7431be31d52a8cfbd941 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -1906,6 +1906,26 @@ static inline WebDataSource *dataSource(WebDocumentLoader *loader)
     [dataSource(loader) _makeRepresentation];
 }
 
+- (void)_addDocumentLoader:(WebDocumentLoader *)loader toUnarchiveState:(WebArchive *)archive
+{
+    [dataSource(loader) _addToUnarchiveState:archive];
+}
+
+- (void)_revertToProvisionalStateForDocumentLoader:(WebDocumentLoader *)loader
+{
+    [dataSource(loader) _revertToProvisionalState];
+}
+
+- (void)_setMainDocumentError:(NSError *)error forDocumentLoader:(WebDocumentLoader *)loader
+{
+    [dataSource(loader) _setMainDocumentError:error];
+}
+
+- (void)_clearUnarchivingStateForLoader:(WebDocumentLoader *)loader
+{
+    [dataSource(loader) _clearUnarchivingState];
+}
+
 - (void)_progressStarted
 {
     [[self webView] _progressStarted:self];
@@ -1964,11 +1984,6 @@ static inline WebDataSource *dataSource(WebDocumentLoader *loader)
     [dataSource(loader) _receivedData:data];
 }
 
-- (void)_revertToProvisionalWithDocumentLoader:(WebDocumentLoader *)loader
-{
-    [dataSource(loader) _revertToProvisionalState];
-}
-
 - (void)_documentLoader:(WebDocumentLoader *)loader setMainDocumentError:(NSError *)error
 {
     [dataSource(loader) _setMainDocumentError:error];
@@ -1979,11 +1994,6 @@ static inline WebDataSource *dataSource(WebDocumentLoader *loader)
     [dataSource(loader) _clearUnarchivingState];
 }
 
-- (NSURL *)_URLForHistoryForDocumentLoader:(WebDocumentLoader *)loader
-{
-    return [dataSource(loader) _URLForHistory];
-}
-
 - (NSError *)_cancelledErrorWithRequest:(NSURLRequest *)request
 {
     return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled URL:[request URL]];