Reviewed by Darin

        Refactored a whole bunch of WebFramePrivate.h SPI to WebFrameInternal

        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
        * History/WebHistoryItem.m:
        * Loader/WebFrameLoader.h:
        * Misc/WebCoreStatistics.m:
        * Misc/WebElementDictionary.m:
        * Plugins/WebNetscapePluginEmbeddedView.m:
        * Plugins/WebPluginController.m:
        * WebCoreSupport/WebViewFactory.m:
        * WebView/WebArchiver.m:
        * WebView/WebDataSource.m:
        * WebView/WebFrame.m:
        (-[WebFrame _isDescendantOfFrame:]):
        (-[WebFrame _setShouldCreateRenderers:]):
        (-[WebFrame _bodyBackgroundColor]):
        (-[WebFrame _isFrameSet]):
        (-[WebFrame _firstLayoutDone]):
        (-[WebFrame _loadType]):
        * WebView/WebFrameInternal.h:
        * WebView/WebFramePrivate.h:
        * WebView/WebHTMLRepresentation.m:
        * WebView/WebScriptDebugDelegate.m:

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bbe1813b7fd56d49fc998892ca6ef00d8d0fffef..9057cc8bbcf257e33e5f170a78c7963c2a9c2778 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,31 @@
+2006-10-06  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin
+
+        Refactored a whole bunch of WebFramePrivate.h SPI to WebFrameInternal
+
+        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
+        * History/WebHistoryItem.m:
+        * Loader/WebFrameLoader.h:
+        * Misc/WebCoreStatistics.m:
+        * Misc/WebElementDictionary.m:
+        * Plugins/WebNetscapePluginEmbeddedView.m:
+        * Plugins/WebPluginController.m:
+        * WebCoreSupport/WebViewFactory.m:
+        * WebView/WebArchiver.m:
+        * WebView/WebDataSource.m:
+        * WebView/WebFrame.m:
+        (-[WebFrame _isDescendantOfFrame:]):
+        (-[WebFrame _setShouldCreateRenderers:]):
+        (-[WebFrame _bodyBackgroundColor]):
+        (-[WebFrame _isFrameSet]):
+        (-[WebFrame _firstLayoutDone]):
+        (-[WebFrame _loadType]):
+        * WebView/WebFrameInternal.h:
+        * WebView/WebFramePrivate.h:
+        * WebView/WebHTMLRepresentation.m:
+        * WebView/WebScriptDebugDelegate.m:
+
 2006-10-06  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m b/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
index 3fa205e17198fb4cf95cfad8462185ca44f58820..6255445369fc9f22d2e08012cfd6f956949236eb 100644 (file)
--- a/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
+++ b/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
@@ -35,7 +35,7 @@
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebDefaultUIDelegate.h>
 #import <WebKit/WebDOMOperations.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebLocalizableStrings.h>
 #import <WebKit/WebNSPasteboardExtras.h>

diff --git a/WebKit/History/WebHistoryItem.m b/WebKit/History/WebHistoryItem.m
index 7b19a9b735393c4925dbf69e2045c090d62388a0..a492e2330bbb0774256f7cf11b9428171743f7ac 100644 (file)
--- a/WebKit/History/WebHistoryItem.m
+++ b/WebKit/History/WebHistoryItem.m
@@ -30,7 +30,7 @@
 
 #import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebFrameBridge.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebHTMLViewInternal.h>
 #import <WebKit/WebIconDatabase.h>

diff --git a/WebKit/Loader/WebFrameLoader.h b/WebKit/Loader/WebFrameLoader.h
index 87815bfdeb6986b04cea48e75585a32c3af6412f..3cc3b97b4d30e65ced5884884835ad81a8e2f3ec 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.h
+++ b/WebKit/Loader/WebFrameLoader.h
@@ -34,6 +34,8 @@
 
 @class WebArchive;
 @class WebDataSource;
+@class WebFormState;
+@class WebFrameBridge;
 @class WebMainResourceLoader;
 @class WebLoader;
 @class WebResource;

diff --git a/WebKit/Misc/WebCoreStatistics.m b/WebKit/Misc/WebCoreStatistics.m
index 63ad94b08d169fae3d04f44357e6b4e9d189e03e..ebd7d1495ae1d6549d3285d515e89c67ac2e9cdc 100644 (file)
--- a/WebKit/Misc/WebCoreStatistics.m
+++ b/WebKit/Misc/WebCoreStatistics.m
@@ -32,7 +32,7 @@
 #import <WebCore/WebCoreJavaScript.h>
 
 #import <WebKit/WebFrameBridge.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameInternal.h>
 
 @implementation WebCoreStatistics
 

diff --git a/WebKit/Misc/WebElementDictionary.m b/WebKit/Misc/WebElementDictionary.m
index 77851b2111ca06f09f20353528e6e671be2df872..bb5004192e6f3ce05bcd197b6c0d457a2460353c 100644 (file)
--- a/WebKit/Misc/WebElementDictionary.m
+++ b/WebKit/Misc/WebElementDictionary.m
@@ -31,6 +31,7 @@
 #import "WebDOMOperations.h"
 #import "WebFrame.h"
 #import "WebFrameBridge.h"
+#import "WebFrameInternal.h"
 #import "WebView.h"
 #import "WebViewPrivate.h"
 

diff --git a/WebKit/Plugins/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
index 1d56007343a7843127f34247bcf5de496bb83b3d..ccc125f6e49d69aeeb67849f80f044b5efabd7f8 100644 (file)
--- a/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins/WebNetscapePluginEmbeddedView.m
@@ -34,7 +34,7 @@
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebFrame.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebNetscapePluginPackage.h>
 #import <WebKit/WebNetscapePluginStream.h>

diff --git a/WebKit/Plugins/WebPluginController.m b/WebKit/Plugins/WebPluginController.m
index c7f5b261605e5b57b26d35ee2e5beaef945f04e2..9a6eeab7b92d304474218ac93783cf1ff9e41c61 100644 (file)
--- a/WebKit/Plugins/WebPluginController.m
+++ b/WebKit/Plugins/WebPluginController.m
@@ -30,7 +30,7 @@
 #import <WebKit/WebPluginController.h>
 
 #import <WebKit/WebFrameBridge.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebKitErrorsPrivate.h>

diff --git a/WebKit/WebCoreSupport/WebViewFactory.m b/WebKit/WebCoreSupport/WebViewFactory.m
index ec54392f51dacddd7e36224dfc6a6ce84398c837..77283f4f7b93031edcafaaa5b44d6b0b521ddb8f 100644 (file)
--- a/WebKit/WebCoreSupport/WebViewFactory.m
+++ b/WebKit/WebCoreSupport/WebViewFactory.m
@@ -30,6 +30,7 @@
 
 #import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebViewInternal.h>
 #import <WebKit/WebHTMLViewInternal.h>
 #import <WebKit/WebLocalizableStrings.h>

diff --git a/WebKit/WebView/WebArchiver.m b/WebKit/WebView/WebArchiver.m
index 3e4e581849cbec9f937312cef496c3f4317e737a..d3347dc22ebb2fbed90cbb7f88b12cf9c5d2198f 100644 (file)
--- a/WebKit/WebView/WebArchiver.m
+++ b/WebKit/WebView/WebArchiver.m
@@ -36,7 +36,7 @@
 #import "WebDOMOperationsPrivate.h"
 #import "WebFrame.h"
 #import "WebFrameBridge.h"
-#import "WebFramePrivate.h"
+#import "WebFrameInternal.h"
 #import "WebResource.h"
 
 @implementation WebArchiver

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index 1bf1f36484580fa2e07135d338d9691982bad1db..bd2523fbbec42287fce77c7246e9dd73a3f0ea97 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -35,6 +35,7 @@
 #import "WebDefaultResourceLoadDelegate.h"
 #import "WebDocument.h"
 #import "WebFrameBridge.h"
+#import "WebFrameInternal.h"
 #import "WebFrameLoader.h"
 #import "WebFrameLoadDelegate.h"
 #import "WebHTMLRepresentation.h"

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index 7e2b72f2134fa5c59b6428716c1167cbc398a709..b8f28f6f36224e92108746d6e21520a310b75a4b 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -222,7 +222,6 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
 }
 
 @end
-
 static inline WebFrame *Frame(WebCoreFrameBridge *bridge)
 {
     return [(WebFrameBridge *)bridge webFrame];
@@ -261,7 +260,7 @@ static inline WebFrame *Frame(WebCoreFrameBridge *bridge)
 
 @end
 
-@implementation WebFrame (WebPrivate)
+@implementation WebFrame (WebInternal)
 
 - (NSURLRequest *)_webDataRequestForData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName: (NSString *)encodingName baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL
 {
@@ -363,17 +362,6 @@ static inline WebFrame *Frame(WebCoreFrameBridge *bridge)
     return Frame([[self _bridge] childFrameNamed:name]);
 }
 
-// FIXME: this exists only as a convenience for Safari, consider moving there
-- (BOOL)_isDescendantOfFrame:(WebFrame *)ancestor
-{
-    return [[self _bridge] isDescendantOfFrame:[ancestor _bridge]];
-}
-
-- (BOOL)_isFrameSet
-{
-    return [_private->bridge isFrameSet];
-}
-
 - (void)_detachChildren
 {
     // FIXME: is it really necessary to do this in reverse order any more?
@@ -424,11 +412,6 @@ static inline WebFrame *Frame(WebCoreFrameBridge *bridge)
     [self release];
 }
 
-- (WebFrameLoadType)_loadType
-{
-    return [_private->frameLoader loadType];
-}
-
 - (void)_makeDocumentView
 {
     NSView <WebDocumentView> *documentView = [_private->webFrameView _makeDocumentViewForDataSource:[_private->frameLoader dataSource]];
@@ -1719,11 +1702,6 @@ exit:
     return Frame([[self _bridge] previousFrameWithWrap:wrapFlag]);
 }
 
-- (void)_setShouldCreateRenderers:(BOOL)f
-{
-    [_private->bridge setShouldCreateRenderers:f];
-}
-
 - (BOOL)_shouldCreateRenderers
 {
     return [_private->bridge shouldCreateRenderers];
@@ -1741,11 +1719,6 @@ exit:
     return num;
 }
 
-- (NSColor *)_bodyBackgroundColor
-{
-    return [_private->bridge bodyBackgroundColor];
-}
-
 - (void)_reloadForPluginChanges
 {
     for (WebFrame *frame = self; frame; frame = [frame _traverseNextFrameStayWithin:self]) {
@@ -1788,15 +1761,6 @@ exit:
     }
 }
 
-- (BOOL)_firstLayoutDone
-{
-    return [_private->frameLoader firstLayoutDone];
-}
-
-@end
-
-@implementation WebFrame (WebInternal)
-
 - (void)_didReceiveServerRedirectForProvisionalLoadForFrame
 {
     [[[self webView] _frameLoadDelegateForwarder] webView:[self webView]
@@ -2237,6 +2201,41 @@ exit:
 
 @end
 
+@implementation WebFrame (WebPrivate)
+
+// FIXME: this exists only as a convenience for Safari, consider moving there
+- (BOOL)_isDescendantOfFrame:(WebFrame *)ancestor
+{
+    return [[self _bridge] isDescendantOfFrame:[ancestor _bridge]];
+}
+
+- (void)_setShouldCreateRenderers:(BOOL)f
+{
+    [_private->bridge setShouldCreateRenderers:f];
+}
+
+- (NSColor *)_bodyBackgroundColor
+{
+    return [_private->bridge bodyBackgroundColor];
+}
+
+- (BOOL)_isFrameSet
+{
+    return [_private->bridge isFrameSet];
+}
+
+- (BOOL)_firstLayoutDone
+{
+    return [_private->frameLoader firstLayoutDone];
+}
+
+- (WebFrameLoadType)_loadType
+{
+    return [_private->frameLoader loadType];
+}
+
+@end
+
 @implementation WebFormState : NSObject
 
 - (id)initWithForm:(DOMElement *)form values:(NSDictionary *)values sourceFrame:(WebFrame *)sourceFrame

diff --git a/WebKit/WebView/WebFrameInternal.h b/WebKit/WebView/WebFrameInternal.h
index 423b2a2b48b22c0bc044b2b04f29b0e2a096df8b..740a3418a7d4997862b5ed201bff21b905bb726e 100644 (file)
--- a/WebKit/WebView/WebFrameInternal.h
+++ b/WebKit/WebView/WebFrameInternal.h
@@ -29,10 +29,14 @@
 // This header contains WebFrame declarations that can be used anywhere in WebKit, but are neither SPI nor API.
 
 #import <WebKit/WebFramePrivate.h>
+#import "WebPolicyDelegatePrivate.h"
 
 @class WebDocumentLoadState;
 @class WebInspector;
 @class WebFrameLoader;
+@class WebFrameView;
+@class WebFrameBridge;
+@class WebFormState;
 
 // One day we might want to expand the use of this kind of class such that we'd receive one
 // over the bridge, and possibly hand it on through to the FormsDelegate.
@@ -90,6 +94,69 @@
 - (WebDocumentLoadState *)_createDocumentLoadStateWithRequest:(NSURLRequest *)request;
 - (void)_didReceiveServerRedirectForProvisionalLoadForFrame;
 
+- (NSURLRequest *)_webDataRequestForData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL;
+
+- (void)_detachFromParent;
+- (void)_detachChildren;
+- (void)_closeOldDataSources;
+- (void)_commitProvisionalLoad:(NSDictionary *)pageCache;
+- (void)_checkLoadCompleteForThisFrame;
+- (void)_handledOnloadEvents;
+- (void)_checkLoadComplete;
+- (WebFrameBridge *)_bridge;
+
+- (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type;
+- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
+- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer intoChild:(WebFrame *)childFrame;
+- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSArray *)postData contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
+
+- (void)_loadRequest:(NSURLRequest *)request inFrameNamed:(NSString *)frameName;
+
+- (void)_clientRedirectedTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction;
+- (void)_clientRedirectCancelledOrFinished:(BOOL)cancelWithLoadInProgress;
+
+- (void)_defersCallbacksChanged;
+
+- (void)_viewWillMoveToHostWindow:(NSWindow *)hostWindow;
+- (void)_viewDidMoveToHostWindow;
+
+- (void)_addChild:(WebFrame *)child;
+
+- (NSDictionary *)_actionInformationForNavigationType:(WebNavigationType)navigationType event:(NSEvent *)event originalURL:(NSURL *)URL;
+
+- (WebHistoryItem *)_itemForSavingDocState;
+- (WebHistoryItem *)_itemForRestoringDocState;
+
+- (void)_saveDocumentAndScrollState;
+
+- (void)_setTitle:(NSString *)title;
+
+- (void)_receivedMainResourceError:(NSError *)error;
+
++ (CFAbsoluteTime)_timeOfLastCompletedLoad;
+- (BOOL)_canCachePage;
+- (void)_purgePageCache;
+
+- (void)_opened;
+// used to decide to use loadType=Same
+- (BOOL)_shouldTreatURLAsSameAsCurrent:(NSURL *)URL;
+
+- (WebFrame *)_nextFrameWithWrap:(BOOL)wrapFlag;
+- (WebFrame *)_previousFrameWithWrap:(BOOL)wrapFlag;
+
+
+- (BOOL)_shouldCreateRenderers;
+
+- (int)_numPendingOrLoadingRequests:(BOOL)recurse;
+
+- (void)_reloadForPluginChanges;
+
+- (void)_attachScriptDebugger;
+- (void)_detachScriptDebugger;
+
+- (void)_recursive_pauseNullEventsForAllNetscapePlugins;
+- (void)_recursive_resumeNullEventsForAllNetscapePlugins;
+
 - (void)_restoreScrollPositionAndViewState;
 
 @end

diff --git a/WebKit/WebView/WebFramePrivate.h b/WebKit/WebView/WebFramePrivate.h
index 41a44f30c2c2f2625ad65334f4d3e1f902657ddc..81583d97f02139b92373acd6f0bbf808938b85ed 100644 (file)
--- a/WebKit/WebView/WebFramePrivate.h
+++ b/WebKit/WebView/WebFramePrivate.h
@@ -31,22 +31,6 @@
 // But it also contains a bunch of internal stuff that should be moved to WebFrameInternal.h
 
 #import <WebKit/WebFrame.h>
-#import <WebKit/WebPolicyDelegatePrivate.h>
-
-@class DOMDocument;
-@class DOMElement;
-@class DOMNode;
-@class NSMutableURLRequest;
-@class NSURLRequest;
-@class WebArchive;
-@class WebFrameBridge;
-@class WebFormState;
-@class WebFrameBridge;
-@class WebFrameView;
-@class WebHistoryItem;
-@class WebPolicyDecisionListener;
-@class WebScriptDebugger;
-@class WebView;
 
 // Keys for accessing the values in the page cache dictionary.
 extern NSString *WebPageCacheEntryDateKey;
@@ -66,77 +50,10 @@ typedef enum {
 } WebFrameLoadType;
 
 @interface WebFrame (WebPrivate)
-
-// Other private methods
-- (NSURLRequest *)_webDataRequestForData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL;
-
-- (void)_detachFromParent;
-- (void)_detachChildren;
-- (void)_closeOldDataSources;
-- (void)_commitProvisionalLoad:(NSDictionary *)pageCache;
-- (void)_checkLoadCompleteForThisFrame;
-- (void)_handledOnloadEvents;
-- (void)_checkLoadComplete;
-- (WebFrameBridge *)_bridge;
-- (WebFrameLoadType)_loadType;
-
-- (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type;
-- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer loadType:(WebFrameLoadType)loadType target:(NSString *)target triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
-- (void)_loadURL:(NSURL *)URL referrer:(NSString *)referrer intoChild:(WebFrame *)childFrame;
-- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSArray *)postData contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
-
-- (void)_loadRequest:(NSURLRequest *)request inFrameNamed:(NSString *)frameName;
-
-- (void)_clientRedirectedTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction;
-- (void)_clientRedirectCancelledOrFinished:(BOOL)cancelWithLoadInProgress;
-
-- (void)_defersCallbacksChanged;
-
-- (void)_viewWillMoveToHostWindow:(NSWindow *)hostWindow;
-- (void)_viewDidMoveToHostWindow;
-
-- (void)_addChild:(WebFrame *)child;
-
-- (NSDictionary *)_actionInformationForNavigationType:(WebNavigationType)navigationType event:(NSEvent *)event originalURL:(NSURL *)URL;
-
-- (WebHistoryItem *)_itemForSavingDocState;
-- (WebHistoryItem *)_itemForRestoringDocState;
-
-- (void)_saveDocumentAndScrollState;
-
-- (void)_setTitle:(NSString *)title;
-
-- (void)_receivedMainResourceError:(NSError *)error;
-
-+ (CFAbsoluteTime)_timeOfLastCompletedLoad;
-- (BOOL)_canCachePage;
-- (void)_purgePageCache;
-
-- (void)_opened;
-// used to decide to use loadType=Same
-- (BOOL)_shouldTreatURLAsSameAsCurrent:(NSURL *)URL;
-
-- (WebFrame *)_nextFrameWithWrap:(BOOL)wrapFlag;
-- (WebFrame *)_previousFrameWithWrap:(BOOL)wrapFlag;
-
+- (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
 - (void)_setShouldCreateRenderers:(BOOL)f;
-- (BOOL)_shouldCreateRenderers;
-
-- (int)_numPendingOrLoadingRequests:(BOOL)recurse;
-
 - (NSColor *)_bodyBackgroundColor;
-
-- (void)_reloadForPluginChanges;
-
-- (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
 - (BOOL)_isFrameSet;
-
-- (void)_attachScriptDebugger;
-- (void)_detachScriptDebugger;
-
-- (void)_recursive_pauseNullEventsForAllNetscapePlugins;
-- (void)_recursive_resumeNullEventsForAllNetscapePlugins;
-
 - (BOOL)_firstLayoutDone;
-
+- (WebFrameLoadType)_loadType;
 @end

diff --git a/WebKit/WebView/WebHTMLRepresentation.m b/WebKit/WebView/WebHTMLRepresentation.m
index 9ac8942ef688bcc1ec218f74888eb2f0dd62c160..020c77481fe3cf7e91b4d35941823073fd60d4da 100644 (file)
--- a/WebKit/WebView/WebHTMLRepresentation.m
+++ b/WebKit/WebView/WebHTMLRepresentation.m
@@ -33,7 +33,7 @@
 #import "WebDataSourceInternal.h"
 #import "WebDocumentPrivate.h"
 #import "WebFrameBridge.h"
-#import "WebFramePrivate.h"
+#import "WebFrameInternal.h"
 #import "WebKitNSStringExtras.h"
 #import "WebKitStatisticsPrivate.h"
 #import "WebNSObjectExtras.h"

diff --git a/WebKit/WebView/WebScriptDebugDelegate.m b/WebKit/WebView/WebScriptDebugDelegate.m
index 03a15fd61085bf31fd7b417db818370cf699811e..c968cad3dce8e5da9c63e067ea6b08c29c709fbe 100644 (file)
--- a/WebKit/WebView/WebScriptDebugDelegate.m
+++ b/WebKit/WebView/WebScriptDebugDelegate.m
@@ -32,6 +32,7 @@
 #import "WebDataSourceInternal.h"
 
 #import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebViewInternal.h>
 #import <WebCore/WebCoreScriptDebugger.h>