Reviewed by Adam.

        - removed a few includes from WebFrameLoader, fixed up as appropriate
        - segregated header includes into ones that need to go away to move the code and ones that don't

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader _privateBrowsingEnabled]):
        (-[WebFrameLoader willUseArchiveForRequest:originalURL:loader:]):
        * Loader/WebFrameLoaderClient.h:
        * WebView/WebFrame.m:
        (-[WebFrame _privateBrowsingEnabled]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3fa055b08b08c9a83d0bdbc0e71950f38d874602..549b2cbcbcf244358e75c0fc51ce492f6671ab99 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2006-10-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam.
+        
+        - removed a few includes from WebFrameLoader, fixed up as appropriate
+        - segregated header includes into ones that need to go away to move the code and ones that don't
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader _privateBrowsingEnabled]):
+        (-[WebFrameLoader willUseArchiveForRequest:originalURL:loader:]):
+        * Loader/WebFrameLoaderClient.h:
+        * WebView/WebFrame.m:
+        (-[WebFrame _privateBrowsingEnabled]):
+
 2006-10-08  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index ba38b451e8cfd4b02ff3b7b562647b623cdce608..6a43b0146187d9c17d6cc8692839d2c19019efab 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -29,34 +29,34 @@
 #import "WebFrameLoader.h"
 
 #import "WebDataProtocol.h"
+#import "WebDocumentLoader.h"
+#import "WebFrameBridge.h"
+#import "WebFrameLoaderClient.h"
+#import "WebMainResourceLoader.h"
+#import <JavaScriptCore/Assertions.h>
+#import <WebKit/DOMHTML.h>
+
 #import "WebDataSourceInternal.h"
 #import "WebDefaultResourceLoadDelegate.h"
 #import "WebDefaultUIDelegate.h"
 #import "WebDocumentLoaderMac.h"
 #import "WebDownloadInternal.h"
-#import "WebFormDataStream.h"
-#import "WebFrameBridge.h"
 #import "WebFrameInternal.h"
 #import "WebFrameLoadDelegate.h"
-#import "WebFrameLoaderClient.h"
 #import "WebHistory.h"
 #import "WebIconDatabasePrivate.h"
 #import "WebKitErrorsPrivate.h"
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
-#import "WebMainResourceLoader.h"
-#import "WebNSDictionaryExtras.h"
 #import "WebNSURLExtras.h"
-#import "WebNSURLRequestExtras.h"
-#import "WebPreferences.h"
+#import "WebResourceLoadDelegate.h"
 #import "WebResourceLoadDelegate.h"
 #import "WebResourcePrivate.h"
+#import "WebDefaultResourceLoadDelegate.h"
 #import "WebScriptDebugServerPrivate.h"
 #import "WebUIDelegate.h"
 #import "WebViewInternal.h"
-#import <JavaScriptCore/Assertions.h>
-#import <WebKit/DOMHTML.h>
-#include "WebFrameViewInternal.h"
+#import "WebFrameViewInternal.h"
 
 @implementation WebFrameLoader
 
@@ -533,7 +533,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (BOOL)_privateBrowsingEnabled
 {
-    return [[[client webView] preferences] privateBrowsingEnabled];
+    return [client _privateBrowsingEnabled];
 }
 
 - (void)_finishedLoadingResource
@@ -1031,7 +1031,7 @@ static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
     if ([[r URL] isEqual:originalURL] && [self _canUseResourceForRequest:r]) {
         WebResource *resource = [self _archivedSubresourceForURL:originalURL];
         if (resource && [self _canUseResourceWithResponse:[resource _response]]) {
-            [[self pendingArchivedResources] _webkit_setObject:resource forUncopiedKey:loader];
+            CFDictionarySetValue((CFMutableDictionaryRef)[self pendingArchivedResources], loader, resource);
             // Deliver the resource after a delay because callers don't expect to receive callbacks while calling this method.
             [self deliverArchivedResourcesAfterDelay];
             return YES;

diff --git a/WebKit/Loader/WebFrameLoaderClient.h b/WebKit/Loader/WebFrameLoaderClient.h
index f5c560e27989a6e1efa10b546de3e0e95446721d..8be9d3e96e024618379a7f3b76d4e82192c5b5fb 100644 (file)
--- a/WebKit/Loader/WebFrameLoaderClient.h
+++ b/WebKit/Loader/WebFrameLoaderClient.h
@@ -38,6 +38,8 @@ typedef struct LoadErrorResetToken LoadErrorResetToken;
 - (BOOL)_loadProvisionalItemFromPageCache;
 - (void)_invalidateCurrentItemPageCache;
 
+- (BOOL)_privateBrowsingEnabled;
+
 - (void)_makeDocumentView;
 
 - (void)_updateHistoryForCommit;

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index 9c5c2128cdeff78175940c498b7d1bc4f0c66921..d49adf0f59a2a29a9c721327a23d5cf7d4834ca0 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -1684,6 +1684,11 @@ static inline WebFrame *Frame(WebCoreFrameBridge *bridge)
     return YES;
 }
 
+- (BOOL)_privateBrowsingEnabled
+{
+    return [[[self webView] preferences] privateBrowsingEnabled];
+}
+
 - (void)_makeDocumentView
 {
     NSView <WebDocumentView> *documentView = [_private->webFrameView _makeDocumentViewForDataSource:[[self _frameLoader] dataSource]];