Rubber stamped by Adam (kinda).

        - add Mac suffixes and correct filenames inside loader/mac

        * WebCore.xcodeproj/project.pbxproj: Updated for changes below.

        * loader/mac/FrameLoader.mm: Removed.
        * loader/mac/WebDocumentLoader.mm: Removed.
        * loader/mac/WebLoader.mm: Removed.
        * loader/mac/WebMainResourceLoader.mm: Removed.
        * loader/mac/WebNetscapePlugInStreamLoader.mm: Removed.
        * loader/mac/WebSubresourceLoader.mm: Removed.

        * loader/mac/FrameLoaderMac.mm: Added.
        * loader/mac/DocumentLoaderMac.mm: Added.
        * loader/mac/ResourceLoaderMac.mm: Added.
        * loader/mac/MainResourceLoaderMac.mm: Added.
        * loader/mac/WebNetscapePlugInStreamLoaderMac.mm: Added.
        * loader/mac/SubresourceLoaderMac.mm: Removed.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3a43d76f99bff44d2eb523a332d78deaa1238e06..c638d18e959cdf239e339b596cd2fa1550c62e61 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-10-29  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Adam (kinda).
+
+        - add Mac suffixes and correct filenames inside loader/mac
+
+        * WebCore.xcodeproj/project.pbxproj: Updated for changes below.
+
+        * loader/mac/FrameLoader.mm: Removed.
+        * loader/mac/WebDocumentLoader.mm: Removed.
+        * loader/mac/WebLoader.mm: Removed.
+        * loader/mac/WebMainResourceLoader.mm: Removed.
+        * loader/mac/WebNetscapePlugInStreamLoader.mm: Removed.
+        * loader/mac/WebSubresourceLoader.mm: Removed.
+
+        * loader/mac/FrameLoaderMac.mm: Added.
+        * loader/mac/DocumentLoaderMac.mm: Added.
+        * loader/mac/ResourceLoaderMac.mm: Added.
+        * loader/mac/MainResourceLoaderMac.mm: Added.
+        * loader/mac/WebNetscapePlugInStreamLoaderMac.mm: Added.
+        * loader/mac/SubresourceLoaderMac.mm: Removed.
+
 2006-10-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Adam.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 325ca068a3660efc4920cf08b9aa4e5570e3a6ff..432512b824c544cb8c39bb51b1f1af486360353d 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -325,23 +325,23 @@
                656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37350ADBA5DE00A4554D /* WebDataProtocol.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371D0ADBA5DE00A4554D /* WebDataProtocol.mm */; };
                656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D37370ADBA5DE00A4554D /* WebDocumentLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371F0ADBA5DE00A4554D /* WebDocumentLoader.mm */; };
+               656D37370ADBA5DE00A4554D /* DocumentLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */; };
                656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37200ADBA5DE00A4554D /* WebFormDataStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 /* FormState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* FormState.cpp */; };
                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 */; };
+               656D373D0ADBA5DE00A4554D /* FrameLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* FrameLoaderMac.mm */; };
                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 */; };
+               656D37400ADBA5DE00A4554D /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */; };
                656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */; };
-               656D37420ADBA5DE00A4554D /* WebMainResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.mm */; };
+               656D37420ADBA5DE00A4554D /* MainResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */; };
                656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm */; };
+               656D37440ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */; };
                656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               656D37490ADBA5DE00A4554D /* WebSubresourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37310ADBA5DE00A4554D /* WebSubresourceLoader.mm */; };
+               656D37490ADBA5DE00A4554D /* SubresourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D37310ADBA5DE00A4554D /* SubresourceLoaderMac.mm */; };
                657429170A9C2D0B00C52C97 /* IconDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429140A9C2D0B00C52C97 /* IconDataCache.h */; };
                657429180A9C2D0B00C52C97 /* SQLStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429150A9C2D0B00C52C97 /* SQLStatement.h */; };
                657429190A9C2D0B00C52C97 /* SQLTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 657429160A9C2D0B00C52C97 /* SQLTransaction.h */; };
@@ -3241,23 +3241,23 @@
                656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
                656D371D0ADBA5DE00A4554D /* WebDataProtocol.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebDataProtocol.mm; sourceTree = "<group>"; };
                656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
-               656D371F0ADBA5DE00A4554D /* WebDocumentLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebDocumentLoader.mm; sourceTree = "<group>"; };
+               656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = DocumentLoaderMac.mm; sourceTree = "<group>"; };
                656D37200ADBA5DE00A4554D /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
                656D37210ADBA5DE00A4554D /* WebFormDataStream.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebFormDataStream.m; sourceTree = "<group>"; };
                656D37220ADBA5DE00A4554D /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
                656D37230ADBA5DE00A4554D /* FormState.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FormState.cpp; 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>"; };
+               656D37250ADBA5DE00A4554D /* FrameLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = FrameLoaderMac.mm; 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>"; };
+               656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
                656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
-               656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebMainResourceLoader.mm; sourceTree = "<group>"; };
+               656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = MainResourceLoaderMac.mm; sourceTree = "<group>"; };
                656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
-               656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebNetscapePlugInStreamLoader.mm; sourceTree = "<group>"; };
+               656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = NetscapePlugInStreamLoaderMac.mm; sourceTree = "<group>"; };
                656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
                656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
-               656D37310ADBA5DE00A4554D /* WebSubresourceLoader.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebSubresourceLoader.mm; sourceTree = "<group>"; };
+               656D37310ADBA5DE00A4554D /* SubresourceLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = SubresourceLoaderMac.mm; sourceTree = "<group>"; };
                657429140A9C2D0B00C52C97 /* IconDataCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconDataCache.h; sourceTree = "<group>"; };
                657429150A9C2D0B00C52C97 /* SQLStatement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SQLStatement.h; sourceTree = "<group>"; };
                657429160A9C2D0B00C52C97 /* SQLTransaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SQLTransaction.h; sourceTree = "<group>"; };
@@ -7495,7 +7495,7 @@
                        isa = PBXGroup;
                        children = (
                                654F68870AF1B7C50065BDD6 /* CachedResourceMac.mm */,
-                               656D37250ADBA5DE00A4554D /* FrameLoader.mm */,
+                               656D37250ADBA5DE00A4554D /* FrameLoaderMac.mm */,
                                51A1D2C50AB69120000D732C /* IconLoaderMac.mm */,
                                93A1EAA70A563508006960A0 /* ImageDocumentMac.h */,
                                93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */,
@@ -7506,14 +7506,14 @@
                                6563A9A60ADF4094000ED2CD /* LoaderNSURLRequestExtras.m */,
                                656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */,
                                656D371D0ADBA5DE00A4554D /* WebDataProtocol.mm */,
-                               656D371F0ADBA5DE00A4554D /* WebDocumentLoader.mm */,
+                               656D371F0ADBA5DE00A4554D /* DocumentLoaderMac.mm */,
                                656D37200ADBA5DE00A4554D /* WebFormDataStream.h */,
                                656D37210ADBA5DE00A4554D /* WebFormDataStream.m */,
-                               656D37280ADBA5DE00A4554D /* WebLoader.mm */,
-                               656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.mm */,
-                               656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm */,
+                               656D37280ADBA5DE00A4554D /* ResourceLoaderMac.mm */,
+                               656D372A0ADBA5DE00A4554D /* MainResourceLoaderMac.mm */,
+                               656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */,
                                656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */,
-                               656D37310ADBA5DE00A4554D /* WebSubresourceLoader.mm */,
+                               656D37310ADBA5DE00A4554D /* SubresourceLoaderMac.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
@@ -11659,14 +11659,14 @@
                                85B4996C0ADB3FF500925CBB /* DOMSVGPathElement.mm in Sources */,
                                656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */,
                                656D37350ADBA5DE00A4554D /* WebDataProtocol.mm in Sources */,
-                               656D37370ADBA5DE00A4554D /* WebDocumentLoader.mm in Sources */,
+                               656D37370ADBA5DE00A4554D /* DocumentLoaderMac.mm in Sources */,
                                656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */,
                                656D373B0ADBA5DE00A4554D /* FormState.cpp in Sources */,
-                               656D373D0ADBA5DE00A4554D /* FrameLoader.mm in Sources */,
-                               656D37400ADBA5DE00A4554D /* WebLoader.mm in Sources */,
-                               656D37420ADBA5DE00A4554D /* WebMainResourceLoader.mm in Sources */,
-                               656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.mm in Sources */,
-                               656D37490ADBA5DE00A4554D /* WebSubresourceLoader.mm in Sources */,
+                               656D373D0ADBA5DE00A4554D /* FrameLoaderMac.mm in Sources */,
+                               656D37400ADBA5DE00A4554D /* ResourceLoaderMac.mm in Sources */,
+                               656D37420ADBA5DE00A4554D /* MainResourceLoaderMac.mm in Sources */,
+                               656D37440ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm in Sources */,
+                               656D37490ADBA5DE00A4554D /* SubresourceLoaderMac.mm in Sources */,
                                0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */,
                                6563A9A80ADF4094000ED2CD /* LoaderNSURLRequestExtras.m in Sources */,
                                4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */,

diff --git a/WebCore/loader/mac/WebDocumentLoader.mm b/WebCore/loader/mac/DocumentLoaderMac.mm
similarity index 100%
rename from WebCore/loader/mac/WebDocumentLoader.mm
rename to WebCore/loader/mac/DocumentLoaderMac.mm

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

diff --git a/WebCore/loader/mac/WebMainResourceLoader.mm b/WebCore/loader/mac/MainResourceLoaderMac.mm
similarity index 100%
rename from WebCore/loader/mac/WebMainResourceLoader.mm
rename to WebCore/loader/mac/MainResourceLoaderMac.mm

diff --git a/WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm b/WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm
similarity index 100%
rename from WebCore/loader/mac/WebNetscapePlugInStreamLoader.mm
rename to WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm

diff --git a/WebCore/loader/mac/WebLoader.mm b/WebCore/loader/mac/ResourceLoaderMac.mm
similarity index 100%
rename from WebCore/loader/mac/WebLoader.mm
rename to WebCore/loader/mac/ResourceLoaderMac.mm

diff --git a/WebCore/loader/mac/WebSubresourceLoader.mm b/WebCore/loader/mac/SubresourceLoaderMac.mm
similarity index 100%
rename from WebCore/loader/mac/WebSubresourceLoader.mm
rename to WebCore/loader/mac/SubresourceLoaderMac.mm