WebCore:

        Rubber stamped by Adam Roben.

        - renamed WebFrameLoaderClient to match the class name inside it

        * loader/mac/WebFrameLoaderClient.h: Removed.
        * loader/FrameLoaderClient.h: Moved it here.

        * WebCore.xcodeproj/project.pbxproj: Updated project.

        * bridge/mac/FrameMac.mm: Updated includes.
        * bridge/mac/WebCoreFrameBridge.mm: Ditto.
        * loader/mac/FrameLoader.mm: Ditto.
        * loader/mac/WebLoader.h: Ditto.

WebKit:

        Rubber stamped by Adam Roben.

        - renamed WebCore's WebFrameLoaderClient to match the class name inside it

        * WebCoreSupport/WebFrameBridge.mm: Update include.
        * WebCoreSupport/WebFrameLoaderClient.h: Ditto.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d3b7e71ecfc62be9a91f73f826733ea29e1ee33..bc8cb337df9e3220082db225571897c107fafc0e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-29  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Adam Roben.
+
+        - renamed WebFrameLoaderClient to match the class name inside it
+
+        * loader/mac/WebFrameLoaderClient.h: Removed.
+        * loader/FrameLoaderClient.h: Moved it here.
+
+        * WebCore.xcodeproj/project.pbxproj: Updated project.
+
+        * bridge/mac/FrameMac.mm: Updated includes.
+        * bridge/mac/WebCoreFrameBridge.mm: Ditto.
+        * loader/mac/FrameLoader.mm: Ditto.
+        * loader/mac/WebLoader.h: Ditto.
+
 2006-10-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Mitz.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 5ccddb3b498f71d27a5c1bf68c4bce830cb7d1fc..dba87c5940e0b511739e267a88b03acf8ddf411c 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
                656D373B0ADBA5DE00A4554D /* WebFormState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* WebFormState.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, ); }; };
+               656D373E0ADBA5DE00A4554D /* FrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37260ADBA5DE00A4554D /* FrameLoaderClient.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 */; };
                656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */; };
@@ -3247,7 +3247,7 @@
                656D37230ADBA5DE00A4554D /* WebFormState.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebFormState.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>"; };
+               656D37260ADBA5DE00A4554D /* FrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameLoaderClient.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>"; };
                656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
@@ -7511,7 +7511,6 @@
                                656D37230ADBA5DE00A4554D /* WebFormState.mm */,
                                656D37240ADBA5DE00A4554D /* FrameLoader.h */,
                                656D37250ADBA5DE00A4554D /* FrameLoader.mm */,
-                               656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */,
                                656D37270ADBA5DE00A4554D /* WebLoader.h */,
                                656D37280ADBA5DE00A4554D /* WebLoader.mm */,
                                656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */,
@@ -8410,6 +8409,7 @@
                                F523D27902DE43D7018635CA /* Decoder.h */,
                                BCB16C100979C3BD00467741 /* DocLoader.cpp */,
                                BCB16C110979C3BD00467741 /* DocLoader.h */,
+                               656D37260ADBA5DE00A4554D /* FrameLoaderClient.h */,
                                93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */,
                                93ABCE5D06E1A42E0085925B /* FormData.cpp */,
                                93ABCE5E06E1A42E0085925B /* FormData.h */,
@@ -10416,7 +10416,7 @@
                                656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */,
                                656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */,
                                656D373C0ADBA5DE00A4554D /* FrameLoader.h in Headers */,
-                               656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */,
+                               656D373E0ADBA5DE00A4554D /* FrameLoaderClient.h in Headers */,
                                656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */,
                                656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */,
                                656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */,

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 0150cf6f08119df171e404f72a3f3f164a871fd1..558e8639c9bd95ab236e9da7d35f7d08c9074f0e 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -35,7 +35,6 @@
 #import "ClipboardEvent.h"
 #import "ClipboardMac.h"
 #import "Cursor.h"
-#import "WebDocumentLoader.h"
 #import "DOMInternal.h"
 #import "DOMWindow.h"
 #import "Decoder.h"
@@ -46,6 +45,7 @@
 #import "FoundationExtras.h"
 #import "FrameLoadRequest.h"
 #import "FrameLoader.h"
+#import "FrameLoaderClient.h"
 #import "FrameLoaderTypes.h"
 #import "FramePrivate.h"
 #import "GraphicsContext.h"
@@ -56,9 +56,9 @@
 #import "HTMLInputElement.h"
 #import "HTMLNames.h"
 #import "HTMLTableCellElement.h"
+#import "HitTestResult.h"
 #import "Logging.h"
 #import "MouseEventWithHitTestResults.h"
-#import "HitTestResult.h"
 #import "Page.h"
 #import "PlatformKeyboardEvent.h"
 #import "PlatformScrollBar.h"
@@ -79,7 +79,7 @@
 #import "WebCoreSystemInterface.h"
 #import "WebCoreViewFactory.h"
 #import "WebDashboardRegion.h"
-#import "WebFrameLoaderClient.h"
+#import "WebDocumentLoader.h"
 #import "WebScriptObjectPrivate.h"
 #import "csshelper.h"
 #import "htmlediting.h"

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index 5bd0adee3a690a4bdf7e17d3aff99eac0cb79e03..2849d2200b5c04296e82481ede411dffc727254f 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -42,6 +42,7 @@
 #import "FloatRect.h"
 #import "FoundationExtras.h"
 #import "FrameLoader.h"
+#import "FrameLoaderClient.h"
 #import "FrameMac.h"
 #import "FrameTree.h"
 #import "GraphicsContext.h"
@@ -49,13 +50,13 @@
 #import "HTMLFormElement.h"
 #import "HTMLInputElement.h"
 #import "HTMLNames.h"
+#import "HitTestResult.h"
 #import "Image.h"
 #import "LoaderFunctions.h"
 #import "LoaderNSURLExtras.h"
 #import "LoaderNSURLRequestExtras.h"
 #import "ModifySelectionListLevel.h"
 #import "MoveSelectionCommand.h"
-#import "HitTestResult.h"
 #import "Page.h"
 #import "PlugInInfoStore.h"
 #import "RenderImage.h"
@@ -80,7 +81,6 @@
 #import "WebCoreWidgetHolder.h"
 #import "WebDocumentLoader.h"
 #import "WebFormDataStream.h"
-#import "WebFrameLoaderClient.h"
 #import "WebSubresourceLoader.h"
 #import "XMLTokenizer.h"
 #import "csshelper.h"

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

diff --git a/WebCore/loader/mac/FrameLoader.mm b/WebCore/loader/mac/FrameLoader.mm
index 7b57763c1584eb3e4c15ae9fa1cd3fe3c637c358..087ca058755c1246846e6d180e59f8c42c9aa538 100644 (file)
--- a/WebCore/loader/mac/FrameLoader.mm
+++ b/WebCore/loader/mac/FrameLoader.mm
@@ -30,10 +30,11 @@
 #import "FrameLoader.h"
 
 #import "Cache.h"
-#import "Document.h"
 #import "DOMElementInternal.h"
+#import "Document.h"
 #import "Element.h"
 #import "FrameLoadRequest.h"
+#import "FrameLoaderClient.h"
 #import "FrameMac.h"
 #import "FramePrivate.h"
 #import "FrameTree.h"
@@ -50,12 +51,10 @@
 #import "WebDocumentLoader.h"
 #import "WebFormDataStream.h"
 #import "WebFormState.h"
-#import "WebFrameLoaderClient.h"
 #import "WebMainResourceLoader.h"
 #import "WebSubresourceLoader.h"
-#import <objc/objc-runtime.h>
-#import <wtf/Assertions.h>
 #import <kjs/JSLock.h>
+#import <wtf/Assertions.h>
 
 using KJS::JSLock;
 using KJS::PausedTimeouts;

diff --git a/WebCore/loader/mac/WebLoader.h b/WebCore/loader/mac/WebLoader.h
index 081a3b1353c1f8dff58b5dda6dedc1c05398db2c..a26cf9089f54db6b32989dc3838160182fa8b7b1 100644 (file)
--- a/WebCore/loader/mac/WebLoader.h
+++ b/WebCore/loader/mac/WebLoader.h
@@ -31,24 +31,24 @@
 #include <wtf/RefPtr.h>
 
 #ifdef __OBJC__
+@class NSCachedURLResponse;
 @class NSError;
 @class NSURLAuthenticationChallenge;
 @class NSURLConnection;
 @class NSURLRequest;
 @class NSURLResponse;
 @class WebCoreResourceLoaderAsDelegate;
-@class NSCachedURLResponse;
 #else
+class NSCachedURLResponse;
 class NSError;
+class NSMutableData;
+class NSObject;
 class NSURLAuthenticationChallenge;
 class NSURLConnection;
+class NSURLCredential;
 class NSURLRequest;
 class NSURLResponse;
 class WebCoreResourceLoaderAsDelegate;
-class NSCachedURLResponse;
-class NSObject;
-class NSURLCredential;
-class NSMutableData;
 typedef NSObject* id;
 #endif
 

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 96c6265654da8424a6e5610360b4aa64bda2569c..3d1670a90106cfd4b1353a9fce0d7f3d8177c724 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-29  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Adam Roben.
+
+        - renamed WebCore's WebFrameLoaderClient to match the class name inside it
+
+        * WebCoreSupport/WebFrameBridge.mm: Update include.
+        * WebCoreSupport/WebFrameLoaderClient.h: Ditto.
+
 2006-10-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebKit/WebCoreSupport/WebFrameBridge.mm b/WebKit/WebCoreSupport/WebFrameBridge.mm
index 127c1cb03b701aa03604ca046d491be7415cbd49..5a44d2c0ac52c80183258f570ea68b80bc6d481a 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameBridge.mm
+++ b/WebKit/WebCoreSupport/WebFrameBridge.mm
@@ -76,6 +76,7 @@
 #import <JavaScriptCore/Assertions.h>
 #import <JavaVM/jni.h>
 #import <WebCore/FrameLoader.h>
+#import <WebCore/FrameLoaderClient.h>
 #import <WebCore/FrameMac.h>
 #import <WebCore/FrameTree.h>
 #import <WebCore/Page.h>
@@ -83,7 +84,6 @@
 #import <WebCore/WebCoreSettings.h>
 #import <WebCore/WebDocumentLoader.h>
 #import <WebCore/WebFormDataStream.h>
-#import <WebCore/WebFrameLoaderClient.h>
 #import <WebCore/WebLoader.h>
 #import <WebCore/WebSubresourceLoader.h>
 #import <WebKitSystemInterface.h>

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
index 3bfd0b9a972a8b19646504a6c71c8cca557adbfa..9b04ebb1dfd4c2f843a98ce378cf9e39de5b265e 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
@@ -26,10 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebCore/FrameLoaderTypes.h>
+#import <WebCore/FrameLoaderClient.h>
 #import <WebCore/RetainPtr.h>
 #import <WebCore/Timer.h>
-#import <WebCore/WebFrameLoaderClient.h>
 #import <wtf/HashMap.h>
 
 @class WebFrame;