WebCore:

        Reviewed by Adam.

        Renamed WebFrameLoader to FrameLoader, to match class name.

        * WebCore.xcodeproj/project.pbxproj:
        * bridge/mac/FrameMac.mm:
        * bridge/mac/WebCoreFrameBridge.mm:
        * loader/mac/FrameLoader.mm: Added.
        * loader/mac/IconLoaderMac.mm:
        * loader/mac/WebDocumentLoader.mm:
        * loader/mac/WebFrameLoader.h: Removed.
        * loader/mac/WebFrameLoader.mm: Removed.
        * loader/mac/WebLoader.mm:
        * loader/mac/WebMainResourceLoader.mm:
        * loader/mac/WebNetscapePlugInStreamLoader.mm:
        * loader/mac/WebSubresourceLoader.mm:

WebKit:

        Reviewed by Adam.

        Renamed WebFrameLoader to FrameLoader, to match class name.

        * Plugins/WebBaseNetscapePluginView.mm:
        * Plugins/WebNetscapePluginStream.mm:
        * Plugins/WebPluginController.mm:
        * WebCoreSupport/WebFrameBridge.mm:
        * WebView/WebDataSource.mm:
        * WebView/WebFrame.mm:
        * WebView/WebPDFView.mm:
        * WebView/WebPolicyDelegate.mm:
        * WebView/WebView.mm:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 497c2cda97685ffd3606c7e3ede57696eb954620..3407c76ee0a39d4751a8b5e464c044c7acfd1562 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2006-10-25  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Adam.
+
+        Renamed WebFrameLoader to FrameLoader, to match class name.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bridge/mac/FrameMac.mm:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        * loader/mac/FrameLoader.mm: Added.
+        * loader/mac/IconLoaderMac.mm:
+        * loader/mac/WebDocumentLoader.mm:
+        * loader/mac/WebFrameLoader.h: Removed.
+        * loader/mac/WebFrameLoader.mm: Removed.
+        * loader/mac/WebLoader.mm:
+        * loader/mac/WebMainResourceLoader.mm:
+        * loader/mac/WebNetscapePlugInStreamLoader.mm:
+        * loader/mac/WebSubresourceLoader.mm:
+
 2006-10-25  Darin Adler  <darin@apple.com>
 
         - fix full builds

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 3478170f856aff6b88adb6441ebf4cc1675bc03f..e48fb5b622d2206acbfd3335a22acf592bae0622 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -328,8 +328,8 @@
                656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37210ADBA5DE00A4554D /* WebFormDataStream.m */; };
                656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37220ADBA5DE00A4554D /* WebFormState.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D373B0ADBA5DE00A4554D /* WebFormState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* WebFormState.mm */; };
-               656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37240ADBA5DE00A4554D /* WebFrameLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D373D0ADBA5DE00A4554D /* WebFrameLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* WebFrameLoader.mm */; };
+               656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37240ADBA5DE00A4554D /* FrameLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D373D0ADBA5DE00A4554D /* FrameLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* FrameLoader.mm */; };
                656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37270ADBA5DE00A4554D /* WebLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37400ADBA5DE00A4554D /* WebLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37280ADBA5DE00A4554D /* WebLoader.mm */; };
@@ -3239,8 +3239,8 @@
                656D37210ADBA5DE00A4554D /* WebFormDataStream.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormDataStream.m; sourceTree = "<group>"; };
                656D37220ADBA5DE00A4554D /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
                656D37230ADBA5DE00A4554D /* WebFormState.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebFormState.mm; sourceTree = "<group>"; };
-               656D37240ADBA5DE00A4554D /* WebFrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoader.h; sourceTree = "<group>"; };
-               656D37250ADBA5DE00A4554D /* WebFrameLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebFrameLoader.mm; sourceTree = "<group>"; };
+               656D37240ADBA5DE00A4554D /* FrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameLoader.h; sourceTree = "<group>"; };
+               656D37250ADBA5DE00A4554D /* FrameLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FrameLoader.mm; sourceTree = "<group>"; };
                656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoaderClient.h; sourceTree = "<group>"; };
                656D37270ADBA5DE00A4554D /* WebLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebLoader.h; sourceTree = "<group>"; };
                656D37280ADBA5DE00A4554D /* WebLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebLoader.mm; sourceTree = "<group>"; };
@@ -7507,8 +7507,8 @@
                                656D37210ADBA5DE00A4554D /* WebFormDataStream.m */,
                                656D37220ADBA5DE00A4554D /* WebFormState.h */,
                                656D37230ADBA5DE00A4554D /* WebFormState.mm */,
-                               656D37240ADBA5DE00A4554D /* WebFrameLoader.h */,
-                               656D37250ADBA5DE00A4554D /* WebFrameLoader.mm */,
+                               656D37240ADBA5DE00A4554D /* FrameLoader.h */,
+                               656D37250ADBA5DE00A4554D /* FrameLoader.mm */,
                                656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */,
                                656D37270ADBA5DE00A4554D /* WebLoader.h */,
                                656D37280ADBA5DE00A4554D /* WebLoader.mm */,
@@ -10414,7 +10414,7 @@
                                656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */,
                                656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */,
                                656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */,
-                               656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */,
+                               656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */,
                                656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */,
                                656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */,
                                656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */,
@@ -11660,7 +11660,7 @@
                                656D37370ADBA5DE00A4554D /* WebDocumentLoader.mm in Sources */,
                                656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */,
                                656D373B0ADBA5DE00A4554D /* WebFormState.mm in Sources */,
-                               656D373D0ADBA5DE00A4554D /* WebFrameLoader.mm in Sources */,
+                               656D373D0ADBA5DE00A4554D /* FrameLoader.mm in Sources */,
                                656D37400ADBA5DE00A4554D /* WebLoader.mm in Sources */,
                                656D37420ADBA5DE00A4554D /* WebMainResourceLoader.mm in Sources */,
                                656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm in Sources */,

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index a0b264802d032cef553dc4d966452413814c3b1a..5abf6eb7a4d7168f0980c2c608bb335f4cfff478 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -41,10 +41,12 @@
 #import "EventNames.h"
 #import "FloatRect.h"
 #import "FontData.h"
+#import "FormDataMac.h"
 #import "FoundationExtras.h"
-#import "FramePrivate.h"
 #import "FrameLoadRequest.h"
+#import "FrameLoader.h"
 #import "FrameLoaderTypes.h"
+#import "FramePrivate.h"
 #import "GraphicsContext.h"
 #import "HTMLDocument.h"
 #import "HTMLFormElement.h"
@@ -53,9 +55,6 @@
 #import "HTMLInputElement.h"
 #import "HTMLNames.h"
 #import "HTMLTableCellElement.h"
-#import "WebCoreEditCommand.h"
-#import "FormDataMac.h"
-#import "WebCorePageState.h"
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
 #import "PlatformKeyboardEvent.h"
@@ -69,18 +68,19 @@
 #import "RenderTableCell.h"
 #import "RenderTheme.h"
 #import "RenderView.h"
-#import "TextIterator.h"
 #import "ResourceLoader.h"
+#import "TextIterator.h"
+#import "WebCoreEditCommand.h"
 #import "WebCoreFrameBridge.h"
+#import "WebCorePageState.h"
+#import "WebCoreSystemInterface.h"
 #import "WebCoreViewFactory.h"
 #import "WebDashboardRegion.h"
-#import "WebFrameLoader.h"
 #import "WebScriptObjectPrivate.h"
 #import "csshelper.h"
 #import "htmlediting.h"
 #import "kjs_window.h"
 #import "visible_units.h"
-#import "WebCoreSystemInterface.h"
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/NP_jsobject.h>
 #import <JavaScriptCore/npruntime_impl.h>

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index 614c4dc8ca25d7b9940055c3a1a7d007dad90541..8f85fd7e8453549f796a3dfcaa66c30624d84dcf 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -40,6 +40,7 @@
 #import "EditorClient.h"
 #import "FloatRect.h"
 #import "FoundationExtras.h"
+#import "FrameLoader.h"
 #import "FrameMac.h"
 #import "FrameTree.h"
 #import "GraphicsContext.h"
@@ -77,7 +78,6 @@
 #import "WebCoreWidgetHolder.h"
 #import "WebDocumentLoader.h"
 #import "WebFormDataStream.h"
-#import "WebFrameLoader.h"
 #import "WebFrameLoaderClient.h"
 #import "WebSubresourceLoader.h"
 #import "XMLTokenizer.h"

diff --git a/WebCore/loader/mac/WebFrameLoader.h b/WebCore/loader/mac/FrameLoader.h
similarity index 100%
rename from WebCore/loader/mac/WebFrameLoader.h
rename to WebCore/loader/mac/FrameLoader.h

diff --git a/WebCore/loader/mac/WebFrameLoader.mm b/WebCore/loader/mac/FrameLoader.mm
similarity index 99%
rename from WebCore/loader/mac/WebFrameLoader.mm
rename to WebCore/loader/mac/FrameLoader.mm
index 2ba212a4a2f88ec69028cd68cf48cbb032d483ed..525273bcacf299b7e8cb9269939a2206b0c35976 100644 (file)
--- a/WebCore/loader/mac/WebFrameLoader.mm
+++ b/WebCore/loader/mac/FrameLoader.mm
@@ -27,7 +27,7 @@
  */
 
 #import "config.h"
-#import "WebFrameLoader.h"
+#import "FrameLoader.h"
 
 #import "DOMElementInternal.h"
 #import "Element.h"

diff --git a/WebCore/loader/mac/IconLoaderMac.mm b/WebCore/loader/mac/IconLoaderMac.mm
index 46edf425e46f363d9b13b7d83e7a604716387c68..994dec7b3de7a7242a02e347def3061862a501f3 100644 (file)
--- a/WebCore/loader/mac/IconLoaderMac.mm
+++ b/WebCore/loader/mac/IconLoaderMac.mm
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "IconLoader.h"
 
+#include "FrameLoader.h"
 #include "FrameMac.h"
-#include "WebFrameLoader.h"
 
 using namespace WebCore;
 

diff --git a/WebCore/loader/mac/WebDocumentLoader.mm b/WebCore/loader/mac/WebDocumentLoader.mm
index 47cb852f76d02e2538a4e683725b16c17bdea627..ebcd86c60d6491980b23e674442009a910f2c757 100644 (file)
--- a/WebCore/loader/mac/WebDocumentLoader.mm
+++ b/WebCore/loader/mac/WebDocumentLoader.mm
@@ -29,11 +29,11 @@
 #import "config.h"
 #import "WebDocumentLoader.h"
 
+#import "FrameLoader.h"
 #import "FrameMac.h"
 #import "WebCoreFrameBridge.h"
 #import "WebCoreSystemInterface.h"
 #import "WebDataProtocol.h"
-#import "WebFrameLoader.h"
 #import <wtf/Assertions.h>
 
 namespace WebCore {

diff --git a/WebCore/loader/mac/WebLoader.mm b/WebCore/loader/mac/WebLoader.mm
index bcd2eafe8d9017969fcf41a8062f02ab37850342..166c5e85e024b255a391696bcd4c1b3a0300f773 100644 (file)
--- a/WebCore/loader/mac/WebLoader.mm
+++ b/WebCore/loader/mac/WebLoader.mm
@@ -29,11 +29,11 @@
 #import "config.h"
 #import "WebLoader.h"
 
+#import "FrameLoader.h"
 #import "FrameMac.h"
 #import "WebCoreFrameBridge.h"
 #import "WebCoreSystemInterface.h"
 #import "WebDataProtocol.h"
-#import "WebFrameLoader.h"
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>

diff --git a/WebCore/loader/mac/WebMainResourceLoader.mm b/WebCore/loader/mac/WebMainResourceLoader.mm
index ba3cd89ec6733ab68ce8cd84c32627cc6ab5d155..3a575c92b54c688316f0cc1589d2f4a97508222e 100644 (file)
--- a/WebCore/loader/mac/WebMainResourceLoader.mm
+++ b/WebCore/loader/mac/WebMainResourceLoader.mm
@@ -29,9 +29,9 @@
 #import "config.h"
 #import "WebMainResourceLoader.h"
 
+#import "FrameLoader.h"
 #import "WebCoreSystemInterface.h"
 #import "WebDataProtocol.h"
-#import "WebFrameLoader.h"
 #import <Foundation/NSHTTPCookie.h>
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>

diff --git a/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm b/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
index 63e977c868e11a8c227e49f77f42f5dba8be50ca..2c7338d7e2056b50093b53ce0cad6bff9cd2e844 100644 (file)
--- a/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
+++ b/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
@@ -29,7 +29,7 @@
 #import "config.h"
 #import "WebNetscapePlugInStreamLoader.h"
 
-#import "WebFrameLoader.h"
+#import "FrameLoader.h"
 #import <wtf/PassRefPtr.h>
 
 namespace WebCore {

diff --git a/WebCore/loader/mac/WebSubresourceLoader.mm b/WebCore/loader/mac/WebSubresourceLoader.mm
index d6396300d65912c582831a2ae7eefb34972525ad..67a832834c3f3b66a6f44de97c9ae3babad68bcc 100644 (file)
--- a/WebCore/loader/mac/WebSubresourceLoader.mm
+++ b/WebCore/loader/mac/WebSubresourceLoader.mm
@@ -29,14 +29,14 @@
 #import "config.h"
 #import "WebSubresourceLoader.h"
 
+#import "FrameLoader.h"
+#import "FrameMac.h"
 #import "LoaderNSURLExtras.h"
 #import "LoaderNSURLRequestExtras.h"
-#import "FrameMac.h"
 #import "WebCoreFrameBridge.h"
 #import "WebCoreResourceLoader.h"
 #import "WebCoreSystemInterface.h"
 #import "WebFormDataStream.h"
-#import "WebFrameLoader.h"
 #import <Foundation/NSURLResponse.h>
 #import <wtf/Assertions.h>
 

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 45b7a91934a42732ab0e99f55ff0cd80b8873445..2b79fe7818c3c90453872593166bb48594a54ad3 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-25  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Adam.
+
+        Renamed WebFrameLoader to FrameLoader, to match class name.
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        * Plugins/WebNetscapePluginStream.mm:
+        * Plugins/WebPluginController.mm:
+        * WebCoreSupport/WebFrameBridge.mm:
+        * WebView/WebDataSource.mm:
+        * WebView/WebFrame.mm:
+        * WebView/WebPDFView.mm:
+        * WebView/WebPolicyDelegate.mm:
+        * WebView/WebView.mm:
+
 2006-10-25  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Anders.

diff --git a/WebKit/Plugins/WebBaseNetscapePluginView.mm b/WebKit/Plugins/WebBaseNetscapePluginView.mm
index fcbc4f1a30705635d46b134b3cf08e81f0c9812f..71b75f666322fd27b21eecd8ba5e78a3fc3e8db2 100644 (file)
--- a/WebKit/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/Plugins/WebBaseNetscapePluginView.mm
@@ -50,7 +50,7 @@
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/Assertions.h>
 #import <JavaScriptCore/npruntime_impl.h>
-#import <WebCore/WebFrameLoader.h> 
+#import <WebCore/FrameLoader.h> 
 #import <WebKit/DOMPrivate.h>
 #import <WebKit/WebUIDelegate.h>
 #import <WebKitSystemInterface.h>

diff --git a/WebKit/Plugins/WebNetscapePluginStream.mm b/WebKit/Plugins/WebNetscapePluginStream.mm
index f99902a526e480080c4871261e95536d29413b29..df7a212f575d9b8c45fc90bb3b6607df927ac9e3 100644 (file)
--- a/WebKit/Plugins/WebNetscapePluginStream.mm
+++ b/WebKit/Plugins/WebNetscapePluginStream.mm
@@ -29,8 +29,8 @@
 #import <WebKit/WebNetscapePluginStream.h>
 
 #import <Foundation/NSURLConnection.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameMac.h>
-#import <WebCore/WebFrameLoader.h>
 #import <WebCore/WebNetscapePlugInStreamLoader.h>
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebFrameBridge.h>

diff --git a/WebKit/Plugins/WebPluginController.mm b/WebKit/Plugins/WebPluginController.mm
index 148978e9f8f196dfd6f1994a54c88c60601ab08c..71a0f8321d0cf100555f2cb9420c82bb74b2f264 100644 (file)
--- a/WebKit/Plugins/WebPluginController.mm
+++ b/WebKit/Plugins/WebPluginController.mm
@@ -29,7 +29,11 @@
 
 #import <WebKit/WebPluginController.h>
 
+#import <Foundation/NSURLRequest.h>
+#import <WebCore/FrameLoader.h>
+#import <WebCore/WebCoreFrameBridge.h>
 #import <WebCore/WebDocumentLoader.h>
+#import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameView.h>
@@ -44,14 +48,8 @@
 #import <WebKit/WebPluginPackage.h>
 #import <WebKit/WebPluginPrivate.h>
 #import <WebKit/WebPluginViewFactory.h>
-#import <WebKit/WebViewInternal.h>
 #import <WebKit/WebUIDelegate.h>
-#import <WebKit/WebDataSourceInternal.h>
-#import <WebCore/WebFrameLoader.h>
-
-#import <WebCore/WebCoreFrameBridge.h>
-
-#import <Foundation/NSURLRequest.h>
+#import <WebKit/WebViewInternal.h>
 
 @interface NSView (PluginSecrets)
 - (void)setContainingWindow:(NSWindow *)w;

diff --git a/WebKit/WebCoreSupport/WebFrameBridge.mm b/WebKit/WebCoreSupport/WebFrameBridge.mm
index 5a5a4af8b979e3e1a85b6fda1f3e8bd91ae77796..8430a4c24f2a81cf3d8b645a4b78d0129e9b076f 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameBridge.mm
+++ b/WebKit/WebCoreSupport/WebFrameBridge.mm
@@ -75,10 +75,10 @@
 #import <Foundation/NSURLResponse.h>
 #import <JavaScriptCore/Assertions.h>
 #import <JavaVM/jni.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/WebCoreFrameNamespaces.h>
 #import <WebCore/WebDocumentLoader.h>
 #import <WebCore/WebFormDataStream.h>
-#import <WebCore/WebFrameLoader.h>
 #import <WebCore/WebFrameLoaderClient.h>
 #import <WebCore/WebLoader.h>
 #import <WebCore/WebSubresourceLoader.h>

diff --git a/WebKit/WebView/WebDataSource.mm b/WebKit/WebView/WebDataSource.mm
index bb878045638b1c3bb825392aa58b39b9600d0273..72546eecb6b06fca6351e6f18866d4f51e254144 100644 (file)
--- a/WebKit/WebView/WebDataSource.mm
+++ b/WebKit/WebView/WebDataSource.mm
@@ -50,8 +50,8 @@
 #import "WebUnarchivingState.h"
 #import "WebViewInternal.h"
 #import <JavaScriptCore/Assertions.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/WebDataProtocol.h>
-#import <WebCore/WebFrameLoader.h>
 #import <WebKit/DOMHTML.h>
 #import <WebKit/DOMPrivate.h>
 #import <WebKitSystemInterface.h>

diff --git a/WebKit/WebView/WebFrame.mm b/WebKit/WebView/WebFrame.mm
index dcc0c9e5a4ed9141c262176f00620b7d0bc465cc..944ffd296472e49d63afaa7bf5bbd96c285d43db 100644 (file)
--- a/WebKit/WebView/WebFrame.mm
+++ b/WebKit/WebView/WebFrame.mm
@@ -66,12 +66,12 @@
 #import "WebUIDelegate.h"
 #import "WebViewInternal.h"
 #import <WebCore/Element.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameMac.h>
 #import <WebCore/FrameTree.h>
 #import <WebCore/WebDataProtocol.h>
 #import <WebCore/WebFormDataStream.h>
 #import <WebCore/WebFormState.h>
-#import <WebCore/WebFrameLoader.h>
 #import <WebCore/WebLoader.h>
 #import <WebKit/DOM.h>
 #import <WebKitSystemInterface.h>

diff --git a/WebKit/WebView/WebPDFView.mm b/WebKit/WebView/WebPDFView.mm
index 18d8486ceade3a46523e488e9c21b7ad0cd66683..71ef1caccfe74a0725dfdcc550c0c18ac26d1c35 100644 (file)
--- a/WebKit/WebView/WebPDFView.mm
+++ b/WebKit/WebView/WebPDFView.mm
@@ -30,6 +30,7 @@
 
 #import "WebDataSourceInternal.h"
 #import "WebDocumentInternal.h"
+#import "WebDocumentPrivate.h"
 #import "WebFrame.h"
 #import "WebFrameInternal.h"
 #import "WebFrameView.h"
@@ -42,10 +43,9 @@
 #import "WebUIDelegate.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
-#import "WebDocumentPrivate.h"
 #import <JavaScriptCore/Assertions.h>
 #import <PDFKit/PDFKit.h>
-#import <WebCore/WebFrameLoader.h>
+#import <WebCore/FrameLoader.h>
 #import <WebKitSystemInterface.h>
 
 #define TEMP_PREFIX "/tmp/XXXXXX-"

diff --git a/WebKit/WebView/WebPolicyDelegate.mm b/WebKit/WebView/WebPolicyDelegate.mm
index 8e34b4833a843c979542dd72285c93d6bc68bdad..05494ed3deb6a4f3a3b9b8d9d1f1d25142b3792c 100644 (file)
--- a/WebKit/WebView/WebPolicyDelegate.mm
+++ b/WebKit/WebView/WebPolicyDelegate.mm
@@ -27,8 +27,8 @@
  */
 
 #import "WebPolicyDelegatePrivate.h"
-#import <WebCore/WebFrameLoader.h>
 
+#import <WebCore/FrameLoader.h>
 #import <objc/objc-runtime.h>
 
 NSString *WebActionNavigationTypeKey = @"WebActionNavigationTypeKey";

diff --git a/WebKit/WebView/WebView.mm b/WebKit/WebView/WebView.mm
index 68351668bfb65a4ecd2a3b43c77059a9475186ed..c881a371ea63a45acfe9726d08073409642f84c9 100644 (file)
--- a/WebKit/WebView/WebView.mm
+++ b/WebKit/WebView/WebView.mm
@@ -85,6 +85,7 @@
 #import <CoreFoundation/CFSet.h>
 #import <Foundation/NSURLConnection.h>
 #import <JavaScriptCore/Assertions.h>
+#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameMac.h>
 #import <WebCore/WebCoreEncodings.h>
 #import <WebCore/WebCoreFrameBridge.h>
@@ -93,7 +94,6 @@
 #import <WebCore/WebCoreView.h>
 #import <WebCore/WebDataProtocol.h>
 #import <WebCore/WebDocumentLoader.h>
-#import <WebCore/WebFrameLoader.h>
 #import <WebKit/DOM.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>