WebCore:
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Oct 2006 10:48:28 +0000 (10:48 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Oct 2006 10:48:28 +0000 (10:48 +0000)
        Rubber stamped by Eric.

        - moved a big honkin' pile of code over from WebKit; made minimal needed changes to compile

        * WebCore.exp:
        * WebCore.xcodeproj/project.pbxproj:
        * loader/mac/LoaderNSURLExtras.m: Added.
        * loader/mac/WebDataProtocol.m: Added.
        * loader/mac/WebDocumentLoader.m: Added.
        * loader/mac/WebFormDataStream.m: Added.
        * loader/mac/WebFrameLoader.m: Added.
        * loader/mac/WebLoader.m: Added.
        (-[NSURLProtocol didReceiveResponse:]):
        (-[NSURLProtocol didReceiveData:lengthReceived:allAtOnce:]):
        * loader/mac/WebMainResourceLoader.m: Added.
        (-[WebMainResourceLoader didReceiveResponse:]):
        * loader/mac/WebPolicyDecider.m: Added.
        * loader/mac/WebSubresourceLoader.h: Added.
        * loader/mac/WebSubresourceLoader.m: Added.

WebKit:

        Rubber stamped by Eric.

        - moved a whole bunch of stuff over to WebCore - updated includes appropriately

        * Loader/LoaderNSURLExtras.h: Removed.
        * Loader/LoaderNSURLExtras.m: Removed.
        * Loader/WebDataProtocol.h: Removed.
        * Loader/WebDataProtocol.m: Removed.
        * Loader/WebDocumentLoader.h: Removed.
        * Loader/WebDocumentLoader.m: Removed.
        * Loader/WebFormDataStream.h: Removed.
        * Loader/WebFormDataStream.m: Removed.
        * Loader/WebFormState.h: Removed.
        * Loader/WebFormState.m: Removed.
        * Loader/WebFrameLoader.h: Removed.
        * Loader/WebFrameLoader.m: Removed.
        * Loader/WebFrameLoaderClient.h: Removed.
        * Loader/WebLoader.h: Removed.
        * Loader/WebLoader.m: Removed.
        * Loader/WebMainResourceLoader.h: Removed.
        * Loader/WebMainResourceLoader.m: Removed.
        * Loader/WebNetscapePlugInStreamLoader.h: Removed.
        * Loader/WebNetscapePlugInStreamLoader.m: Removed.
        * Loader/WebPlugInStreamLoaderDelegate.h: Removed.
        * Loader/WebPolicyDecider.h: Removed.
        * Loader/WebPolicyDecider.m: Removed.
        * Loader/WebSubresourceLoader.h: Removed.
        * Loader/WebSubresourceLoader.m: Removed.
        * Misc/WebNSURLExtras.m:
        * Plugins/WebBaseNetscapePluginStream.h:
        * Plugins/WebBaseNetscapePluginView.m:
        * Plugins/WebNetscapePluginStream.m:
        * Plugins/WebPluginContainerCheck.m:
        * Plugins/WebPluginController.m:
        * WebCoreSupport/WebFrameBridge.m:
        * WebKit.xcodeproj/project.pbxproj:
        * WebView/WebDataSource.m:
        * WebView/WebDocumentLoaderMac.h:
        * WebView/WebFrame.m:
        * WebView/WebFrameInternal.h:
        * WebView/WebHTMLView.m:
        * WebView/WebPolicyDeciderMac.h:
        * WebView/WebPolicyDelegate.m:
        * WebView/WebView.m:

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

44 files changed:
WebCore/ChangeLog
WebCore/WebCore.exp
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/loader/mac/LoaderNSURLExtras.h [moved from WebKit/Loader/LoaderNSURLExtras.h with 100% similarity]
WebCore/loader/mac/LoaderNSURLExtras.m [moved from WebKit/Loader/LoaderNSURLExtras.m with 98% similarity]
WebCore/loader/mac/WebDataProtocol.h [moved from WebKit/Loader/WebDataProtocol.h with 100% similarity]
WebCore/loader/mac/WebDataProtocol.m [moved from WebKit/Loader/WebDataProtocol.m with 99% similarity]
WebCore/loader/mac/WebDocumentLoader.h [moved from WebKit/Loader/WebDocumentLoader.h with 100% similarity]
WebCore/loader/mac/WebDocumentLoader.m [moved from WebKit/Loader/WebDocumentLoader.m with 99% similarity]
WebCore/loader/mac/WebFormDataStream.h [moved from WebKit/Loader/WebFormDataStream.h with 100% similarity]
WebCore/loader/mac/WebFormDataStream.m [moved from WebKit/Loader/WebFormDataStream.m with 99% similarity]
WebCore/loader/mac/WebFormState.h [moved from WebKit/Loader/WebFormState.h with 100% similarity]
WebCore/loader/mac/WebFormState.m [moved from WebKit/Loader/WebFormState.m with 100% similarity]
WebCore/loader/mac/WebFrameLoader.h [moved from WebKit/Loader/WebFrameLoader.h with 100% similarity]
WebCore/loader/mac/WebFrameLoader.m [moved from WebKit/Loader/WebFrameLoader.m with 99% similarity]
WebCore/loader/mac/WebFrameLoaderClient.h [moved from WebKit/Loader/WebFrameLoaderClient.h with 100% similarity]
WebCore/loader/mac/WebLoader.h [moved from WebKit/Loader/WebLoader.h with 100% similarity]
WebCore/loader/mac/WebLoader.m [moved from WebKit/Loader/WebLoader.m with 98% similarity]
WebCore/loader/mac/WebMainResourceLoader.h [moved from WebKit/Loader/WebMainResourceLoader.h with 100% similarity]
WebCore/loader/mac/WebMainResourceLoader.m [moved from WebKit/Loader/WebMainResourceLoader.m with 99% similarity]
WebCore/loader/mac/WebNetscapePlugInStreamLoader.h [moved from WebKit/Loader/WebNetscapePlugInStreamLoader.h with 100% similarity]
WebCore/loader/mac/WebNetscapePlugInStreamLoader.m [moved from WebKit/Loader/WebNetscapePlugInStreamLoader.m with 100% similarity]
WebCore/loader/mac/WebPlugInStreamLoaderDelegate.h [moved from WebKit/Loader/WebPlugInStreamLoaderDelegate.h with 100% similarity]
WebCore/loader/mac/WebPolicyDecider.h [moved from WebKit/Loader/WebPolicyDecider.h with 100% similarity]
WebCore/loader/mac/WebPolicyDecider.m [moved from WebKit/Loader/WebPolicyDecider.m with 97% similarity]
WebCore/loader/mac/WebSubresourceLoader.h [moved from WebKit/Loader/WebSubresourceLoader.h with 98% similarity]
WebCore/loader/mac/WebSubresourceLoader.m [moved from WebKit/Loader/WebSubresourceLoader.m with 98% similarity]
WebKit/ChangeLog
WebKit/Misc/WebNSURLExtras.m
WebKit/Plugins/WebBaseNetscapePluginStream.h
WebKit/Plugins/WebBaseNetscapePluginView.m
WebKit/Plugins/WebNetscapePluginStream.m
WebKit/Plugins/WebPluginContainerCheck.m
WebKit/Plugins/WebPluginController.m
WebKit/WebCoreSupport/WebFrameBridge.m
WebKit/WebKit.xcodeproj/project.pbxproj
WebKit/WebView/WebDataSource.m
WebKit/WebView/WebDocumentLoaderMac.h
WebKit/WebView/WebFrame.m
WebKit/WebView/WebFrameInternal.h
WebKit/WebView/WebHTMLView.m
WebKit/WebView/WebPolicyDeciderMac.h
WebKit/WebView/WebPolicyDelegate.m
WebKit/WebView/WebView.m

index 713ee2fa25a8db0d4eddf51e59f6eff7e3d2a63d..373717851bf079bb118ecefbe25e188e39624735 100644 (file)
@@ -1,3 +1,25 @@
+2006-10-10  Maciej Stachowiak  <mjs@apple.com>
+
+        Rubber stamped by Eric.
+
+        - moved a big honkin' pile of code over from WebKit; made minimal needed changes to compile
+
+        * WebCore.exp:
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/mac/LoaderNSURLExtras.m: Added.
+        * loader/mac/WebDataProtocol.m: Added.
+        * loader/mac/WebDocumentLoader.m: Added.
+        * loader/mac/WebFormDataStream.m: Added.
+        * loader/mac/WebFrameLoader.m: Added.
+        * loader/mac/WebLoader.m: Added.
+        (-[NSURLProtocol didReceiveResponse:]):
+        (-[NSURLProtocol didReceiveData:lengthReceived:allAtOnce:]):
+        * loader/mac/WebMainResourceLoader.m: Added.
+        (-[WebMainResourceLoader didReceiveResponse:]):
+        * loader/mac/WebPolicyDecider.m: Added.
+        * loader/mac/WebSubresourceLoader.h: Added.
+        * loader/mac/WebSubresourceLoader.m: Added.
+
 2006-10-10  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Oliver (sort of?)
index 9bbe9ff619ecd91f3b4e50ffc95307b850252ea5..1d9e22c2b6e7c1379106fbb7aab7173967c3b756 100644 (file)
 .objc_class_name_WebCoreStringTruncator
 .objc_class_name_WebCoreViewFactory
 .objc_class_name_WebDashboardRegion
+.objc_class_name_WebDocumentLoader
+.objc_class_name_WebFrameLoader
+.objc_class_name_WebLoader
+.objc_class_name_WebNetscapePlugInStreamLoader
+.objc_class_name_WebPolicyDecider
 .objc_class_name_WebScriptObject
 .objc_class_name_WebScriptObjectPrivate
+.objc_class_name_WebSubresourceLoader
 .objc_class_name_WebUndefined
 _WebCoreDrawTextAtPoint
 _WebCoreFindFont
@@ -128,6 +134,19 @@ _WebCoreSetAlwaysUseATSU
 _WebCoreSetShouldUseFontSmoothing
 _WebCoreShouldUseFontSmoothing
 _WebCoreTextFloatWidth
+_canonicalURL
+_isBackForwardLoadType
+_stringIsFileURL
+_urlByRemovingComponent
+_urlByRemovingFragment
+_urlByRemovingResourceSpecifier
+_urlIsEmpty
+_urlIsFileURL
+_urlOriginalData
+_urlOriginalDataAsString
+_urlWithData
+_urlWithDataRelativeToURL
+_webSetHTTPBody
 _wkCGContextGetShouldSmoothFonts
 _wkClearGlyphVector
 _wkConvertCharToGlyphs
index 1a2e5044d6c9210f4ec541c8aca6098e85d9c698..49d174de34b1aee5da06ec1d619c4db562f2a040 100644 (file)
                6565820009D1508D000E61D7 /* SVGNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
                6565820209D1508D000E61D7 /* XLinkNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581EB09D1508D000E61D7 /* XLinkNames.h */; };
                6565821309D15111000E61D7 /* ksvgcssvalues.h in Headers */ = {isa = PBXBuildFile; fileRef = 6565820F09D15111000E61D7 /* ksvgcssvalues.h */; };
+               656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */; };
+               656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37350ADBA5DE00A4554D /* WebDataProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */; };
+               656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37370ADBA5DE00A4554D /* WebDocumentLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */; };
+               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 */; };
+               656D373B0ADBA5DE00A4554D /* WebFormState.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37230ADBA5DE00A4554D /* WebFormState.m */; };
+               656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37240ADBA5DE00A4554D /* WebFrameLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D373D0ADBA5DE00A4554D /* WebFrameLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37250ADBA5DE00A4554D /* WebFrameLoader.m */; };
+               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.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37280ADBA5DE00A4554D /* WebLoader.m */; };
+               656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */; };
+               656D37420ADBA5DE00A4554D /* WebMainResourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */; };
+               656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */; };
+               656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37460ADBA5DE00A4554D /* WebPolicyDecider.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37470ADBA5DE00A4554D /* WebPolicyDecider.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */; };
+               656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               656D37490ADBA5DE00A4554D /* WebSubresourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */; };
                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 */; };
                6565820E09D15111000E61D7 /* ksvgcssvalues.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.gperf; sourceTree = "<group>"; };
                6565820F09D15111000E61D7 /* ksvgcssvalues.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ksvgcssvalues.h; sourceTree = "<group>"; };
                6565821009D15111000E61D7 /* ksvgcssvalues.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.in; sourceTree = "<group>"; };
+               656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LoaderNSURLExtras.h; sourceTree = "<group>"; };
+               656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LoaderNSURLExtras.m; sourceTree = "<group>"; };
+               656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
+               656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDataProtocol.m; sourceTree = "<group>"; };
+               656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
+               656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDocumentLoader.m; sourceTree = "<group>"; };
+               656D37200ADBA5DE00A4554D /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
+               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.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormState.m; sourceTree = "<group>"; };
+               656D37240ADBA5DE00A4554D /* WebFrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoader.h; sourceTree = "<group>"; };
+               656D37250ADBA5DE00A4554D /* WebFrameLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFrameLoader.m; 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.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebLoader.m; sourceTree = "<group>"; };
+               656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
+               656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebMainResourceLoader.m; sourceTree = "<group>"; };
+               656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
+               656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePlugInStreamLoader.m; sourceTree = "<group>"; };
+               656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
+               656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDecider.h; sourceTree = "<group>"; };
+               656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDecider.m; sourceTree = "<group>"; };
+               656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
+               656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebSubresourceLoader.m; 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>"; };
                                93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */,
                                F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */,
                                51A1D2C50AB69120000D732C /* IconLoaderMac.mm */,
+                               656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */,
+                               656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */,
+                               656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */,
+                               656D371D0ADBA5DE00A4554D /* WebDataProtocol.m */,
+                               656D371E0ADBA5DE00A4554D /* WebDocumentLoader.h */,
+                               656D371F0ADBA5DE00A4554D /* WebDocumentLoader.m */,
+                               656D37200ADBA5DE00A4554D /* WebFormDataStream.h */,
+                               656D37210ADBA5DE00A4554D /* WebFormDataStream.m */,
+                               656D37220ADBA5DE00A4554D /* WebFormState.h */,
+                               656D37230ADBA5DE00A4554D /* WebFormState.m */,
+                               656D37240ADBA5DE00A4554D /* WebFrameLoader.h */,
+                               656D37250ADBA5DE00A4554D /* WebFrameLoader.m */,
+                               656D37260ADBA5DE00A4554D /* WebFrameLoaderClient.h */,
+                               656D37270ADBA5DE00A4554D /* WebLoader.h */,
+                               656D37280ADBA5DE00A4554D /* WebLoader.m */,
+                               656D37290ADBA5DE00A4554D /* WebMainResourceLoader.h */,
+                               656D372A0ADBA5DE00A4554D /* WebMainResourceLoader.m */,
+                               656D372B0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h */,
+                               656D372C0ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m */,
+                               656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */,
+                               656D372E0ADBA5DE00A4554D /* WebPolicyDecider.h */,
+                               656D372F0ADBA5DE00A4554D /* WebPolicyDecider.m */,
+                               656D37300ADBA5DE00A4554D /* WebSubresourceLoader.h */,
+                               656D37310ADBA5DE00A4554D /* WebSubresourceLoader.m */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                85CE1A9C0ADAC708003BBDEA /* DOMSVGSVGElement.h in Headers */,
                                85CE1AA10ADAC752003BBDEA /* DOMSVGSVGElementInternal.h in Headers */,
                                85CE1AF30ADAD440003BBDEA /* DOMSVGPathSegInternal.h in Headers */,
+                               656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
+                               656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */,
+                               656D37360ADBA5DE00A4554D /* WebDocumentLoader.h in Headers */,
+                               656D37380ADBA5DE00A4554D /* WebFormDataStream.h in Headers */,
+                               656D373A0ADBA5DE00A4554D /* WebFormState.h in Headers */,
+                               656D373C0ADBA5DE00A4554D /* WebFrameLoader.h in Headers */,
+                               656D373E0ADBA5DE00A4554D /* WebFrameLoaderClient.h in Headers */,
+                               656D373F0ADBA5DE00A4554D /* WebLoader.h in Headers */,
+                               656D37410ADBA5DE00A4554D /* WebMainResourceLoader.h in Headers */,
+                               656D37430ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.h in Headers */,
+                               656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */,
+                               656D37460ADBA5DE00A4554D /* WebPolicyDecider.h in Headers */,
+                               656D37480ADBA5DE00A4554D /* WebSubresourceLoader.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
-                       projectRoot = "";
                        targets = (
                                93F198A508245E59001E9ABC /* WebCore */,
                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
                                85CE1A920ADAC650003BBDEA /* DOMSVGPathSegClosePath.mm in Sources */,
                                85CE1A9D0ADAC708003BBDEA /* DOMSVGSVGElement.mm in Sources */,
                                85CE1B020ADADA96003BBDEA /* DOMSVGPathSegInternal.mm in Sources */,
+                               656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */,
+                               656D37350ADBA5DE00A4554D /* WebDataProtocol.m in Sources */,
+                               656D37370ADBA5DE00A4554D /* WebDocumentLoader.m in Sources */,
+                               656D37390ADBA5DE00A4554D /* WebFormDataStream.m in Sources */,
+                               656D373B0ADBA5DE00A4554D /* WebFormState.m in Sources */,
+                               656D373D0ADBA5DE00A4554D /* WebFrameLoader.m in Sources */,
+                               656D37400ADBA5DE00A4554D /* WebLoader.m in Sources */,
+                               656D37420ADBA5DE00A4554D /* WebMainResourceLoader.m in Sources */,
+                               656D37440ADBA5DE00A4554D /* WebNetscapePlugInStreamLoader.m in Sources */,
+                               656D37470ADBA5DE00A4554D /* WebPolicyDecider.m in Sources */,
+                               656D37490ADBA5DE00A4554D /* WebSubresourceLoader.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                EXPORTED_SYMBOLS_FILE = WebCore.exp;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_PREFIX_HEADER = WebCorePrefix.h;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(DEBUG_DEFINES)",
similarity index 98%
rename from WebKit/Loader/LoaderNSURLExtras.m
rename to WebCore/loader/mac/LoaderNSURLExtras.m
index b1c30eea3cfa7621429c0c8a70672f80f72b684e..7af8edc605852e13d59a104a6e56fffa7771c24a 100644 (file)
@@ -29,8 +29,8 @@
 
 #import "LoaderNSURLExtras.h"
 
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
 
 NSURL *urlByRemovingComponent(NSURL *url, CFURLComponentType component)
 {
similarity index 99%
rename from WebKit/Loader/WebDataProtocol.m
rename to WebCore/loader/mac/WebDataProtocol.m
index 3777a5c39b620754cd7a600b00f4de94b94af458..558683edd078c042ec6a7d47c298bd0a92e564ee 100644 (file)
@@ -29,7 +29,7 @@
 #import "WebDataProtocol.h"
 
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 NSString *WebDataProtocolScheme = @"applewebdata";
 static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
similarity index 99%
rename from WebKit/Loader/WebDocumentLoader.m
rename to WebCore/loader/mac/WebDocumentLoader.m
index daf9a6818d1451e31a936ad91bd769bee7dca628..7caad93e5073b2d8345ad0d96908343b00db0e04 100644 (file)
 
 #import "WebDocumentLoader.h"
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 #import "WebFrameLoader.h"
 #import "WebDataProtocol.h"
-#import "WebFrameBridge.h"
-#import <WebCore/WebCoreSystemInterface.h>
+#import "WebCoreFrameBridge.h"
+#import "WebCoreSystemInterface.h"
 
 @implementation WebDocumentLoader
 
similarity index 99%
rename from WebKit/Loader/WebFormDataStream.m
rename to WebCore/loader/mac/WebFormDataStream.m
index cd6093ef62c17a3092463f1b119c1eab176c6d17..1e41ca009c6f90a7770889e3e52600f621d0e6da 100644 (file)
@@ -33,8 +33,8 @@
 #import <sys/types.h>
 #import <sys/stat.h>
 
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
 
 static void formEventCallback(CFReadStreamRef stream, CFStreamEventType type, void *context);
 
similarity index 99%
rename from WebKit/Loader/WebFrameLoader.m
rename to WebCore/loader/mac/WebFrameLoader.m
index ea8cf6931c1eea17a0e513075f2314fe17584bc9..748571be4e93d899cb8243377ead289a0b3e1465 100644 (file)
 #import "WebFrameLoaderClient.h"
 #import "WebMainResourceLoader.h"
 #import "WebPolicyDecider.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 #import <WebKit/DOMHTML.h>
-#import <WebCore/WebCoreFrameBridge.h>
-#import <WebCore/WebCoreIconDatabaseBridge.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import "WebCoreFrameBridge.h"
+#import "WebCoreIconDatabaseBridge.h"
+#import "WebCoreSystemInterface.h"
 
 static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
 {
similarity index 98%
rename from WebKit/Loader/WebLoader.m
rename to WebCore/loader/mac/WebLoader.m
index b131ef18fc3b5ed2017955ff10555261f0ab11a7..47de7bb70dd10745ab8eccafbff2501e22b0723c 100644 (file)
@@ -34,8 +34,8 @@
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
 
 static unsigned inNSURLConnectionCallback;
 static BOOL NSURLConnectionSupportsBufferedData;
@@ -335,9 +335,8 @@ static BOOL NSURLConnectionSupportsBufferedData;
 
     // If the URL is one of our whacky applewebdata URLs then
     // fake up a substitute URL to present to the delegate.
-    if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
-        r = [[[NSURLResponse alloc] initWithURL:[request _webDataRequestExternalURL] MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
-    }
+    if([WebDataProtocol _webIsDataProtocolURL:[r URL]])
+        r = [[[NSURLResponse alloc] initWithURL:[request _webDataRequestExternalURL] MIMEType:[r MIMEType] expectedContentLength:(int)[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
 
     [r retain];
     [response release];
@@ -362,7 +361,7 @@ static BOOL NSURLConnectionSupportsBufferedData;
     
     [self addData:data allAtOnce:allAtOnce];
     
-    [frameLoader _didReceiveData:data contentLength:lengthReceived forResource:identifier];
+    [frameLoader _didReceiveData:data contentLength:(int)lengthReceived forResource:identifier];
 
     [self release];
 }
similarity index 99%
rename from WebKit/Loader/WebMainResourceLoader.m
rename to WebCore/loader/mac/WebMainResourceLoader.m
index 7d578f3d878bb8fbf9fbc05ca9ff8e56ee2abdb8..bad10a7cbc460223c749695e3645d2c0105b42fd 100644 (file)
@@ -34,8 +34,8 @@
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreSystemInterface.h"
 
 // FIXME: More that is in common with WebSubresourceLoader should move up into WebLoader.
 
@@ -327,7 +327,7 @@ static BOOL shouldLoadAsEmptyDocument(NSURL *url)
     // anything including possibly releasing self; one example of this is 3266216
     [self retain];
     [frameLoader _setResponse:r];
-    _contentLength = [r expectedContentLength];
+    _contentLength = (int)[r expectedContentLength];
 
     _response = [r retain];
     [self checkContentPolicy];
similarity index 97%
rename from WebKit/Loader/WebPolicyDecider.m
rename to WebCore/loader/mac/WebPolicyDecider.m
index 05d9416ee315ba238bdf522d1f0ce0f7b96af6b8..a191294f5769c998c9b8889f3b34cb5d08086baf 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "WebPolicyDecider.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 @implementation WebPolicyDecider
 
similarity index 98%
rename from WebKit/Loader/WebSubresourceLoader.h
rename to WebCore/loader/mac/WebSubresourceLoader.h
index 8829d31d36cd26527ba4a0f403618aa635819f26..51f797d6baad9a7d2b4bc5f5c009d625419d775b 100644 (file)
@@ -28,7 +28,7 @@
 
 #import "WebLoader.h"
 
-#import <WebCore/WebCoreResourceLoader.h>
+#import "WebCoreResourceLoader.h"
 
 @class WebFrameLoader;
 
similarity index 98%
rename from WebKit/Loader/WebSubresourceLoader.m
rename to WebCore/loader/mac/WebSubresourceLoader.m
index 61fc107d9ee9433c343453e85581fd53f2e033a6..a7f4fab46ac9e8c2f4b5795aa36e93129323f8d9 100644 (file)
@@ -31,9 +31,9 @@
 #import "WebFormDataStream.h"
 #import "WebFrameLoader.h"
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
-#import <WebCore/WebCoreResourceLoader.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <wtf/Assertions.h>
+#import "WebCoreResourceLoader.h"
+#import "WebCoreSystemInterface.h"
 
 @implementation WebSubresourceLoader
 
index e384844a14eb61b9d2a90190f8f28c8f256e0487..f2f82ab336b8dc91a94ad9512749032f854285a5 100644 (file)
@@ -1,3 +1,50 @@
+2006-10-10  Maciej Stachowiak  <mjs@apple.com>
+
+        Rubber stamped by Eric.
+        
+        - moved a whole bunch of stuff over to WebCore - updated includes appropriately
+
+        * Loader/LoaderNSURLExtras.h: Removed.
+        * Loader/LoaderNSURLExtras.m: Removed.
+        * Loader/WebDataProtocol.h: Removed.
+        * Loader/WebDataProtocol.m: Removed.
+        * Loader/WebDocumentLoader.h: Removed.
+        * Loader/WebDocumentLoader.m: Removed.
+        * Loader/WebFormDataStream.h: Removed.
+        * Loader/WebFormDataStream.m: Removed.
+        * Loader/WebFormState.h: Removed.
+        * Loader/WebFormState.m: Removed.
+        * Loader/WebFrameLoader.h: Removed.
+        * Loader/WebFrameLoader.m: Removed.
+        * Loader/WebFrameLoaderClient.h: Removed.
+        * Loader/WebLoader.h: Removed.
+        * Loader/WebLoader.m: Removed.
+        * Loader/WebMainResourceLoader.h: Removed.
+        * Loader/WebMainResourceLoader.m: Removed.
+        * Loader/WebNetscapePlugInStreamLoader.h: Removed.
+        * Loader/WebNetscapePlugInStreamLoader.m: Removed.
+        * Loader/WebPlugInStreamLoaderDelegate.h: Removed.
+        * Loader/WebPolicyDecider.h: Removed.
+        * Loader/WebPolicyDecider.m: Removed.
+        * Loader/WebSubresourceLoader.h: Removed.
+        * Loader/WebSubresourceLoader.m: Removed.
+        * Misc/WebNSURLExtras.m:
+        * Plugins/WebBaseNetscapePluginStream.h:
+        * Plugins/WebBaseNetscapePluginView.m:
+        * Plugins/WebNetscapePluginStream.m:
+        * Plugins/WebPluginContainerCheck.m:
+        * Plugins/WebPluginController.m:
+        * WebCoreSupport/WebFrameBridge.m:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebView/WebDataSource.m:
+        * WebView/WebDocumentLoaderMac.h:
+        * WebView/WebFrame.m:
+        * WebView/WebFrameInternal.h:
+        * WebView/WebHTMLView.m:
+        * WebView/WebPolicyDeciderMac.h:
+        * WebView/WebPolicyDelegate.m:
+        * WebView/WebView.m:
+
 2006-10-10  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Maciej.
index 6a667cdebcdb7e10a2697c1262a7922efb392345..588b113b2b3c1f79f7419adde4e9f47d61349a38 100644 (file)
@@ -34,7 +34,7 @@
 #import <WebKit/WebNSDataExtras.h>
 #import <WebKit/WebNSObjectExtras.h>
 #import <WebKit/WebLocalizableStrings.h>
-#import "LoaderNSURLExtras.h"
+#import <WebCore/LoaderNSURLExtras.h>
 
 #import <WebKitSystemInterface.h>
 #import "WebSystemInterface.h"
index 651015da7981c3eb357a09f5541055a032d17b03..7c63ec522bb1fbdc4a4ab33000d9acfd077b4f5e 100644 (file)
@@ -29,7 +29,7 @@
 #import <Foundation/Foundation.h>
 
 #import <WebKit/npfunctions.h>
-#import <WebKit/WebPlugInStreamLoaderDelegate.h>
+#import <WebCore/WebPlugInStreamLoaderDelegate.h>
 
 @class WebBaseNetscapePluginView;
 @class NSURLResponse;
index 333fdaa67c2fefc3cf2f072aeb1927256cd63ecf..c5faaa0c70e0a4ca3ba8f3c757043c0e3bfff986 100644 (file)
@@ -35,7 +35,7 @@
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebDefaultUIDelegate.h>
 #import <WebKit/WebFrameInternal.h> 
-#import <WebKit/WebFrameLoader.h> 
+#import <WebCore/WebFrameLoader.h> 
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitNSStringExtras.h>
index fef0f7502c01bbc0b786290d2e9e18a515ff0390..3a69a06725dc2831472e66f68c84629a1b172b80 100644 (file)
@@ -28,7 +28,6 @@
 
 #import <WebKit/WebNetscapePluginStream.h>
 
-#import <WebKit/WebLoader.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebNetscapePluginEmbeddedView.h>
 #import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebNetscapePluginStreamLoader.h>
+#import <WebCore/WebNetscapePluginStreamLoader.h>
 #import <WebKit/WebNSURLRequestExtras.h>
 #import <WebKit/WebViewInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
 
 #import <Foundation/NSURLConnection.h>
 
index 09a5fa1a5b89c36f3c3ef3959f0bf37f16fc9a81..5251919ab7d4d3d21bbe25a3ffb67ffe6ca38ce0 100644 (file)
@@ -41,7 +41,7 @@
 #import <WebKit/WebPolicyDelegatePrivate.h>
 #import <WebKit/WebView.h>
 #import <WebKit/WebViewInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
 #import <objc/objc-runtime.h>
 
 @implementation WebPluginContainerCheck
index ba38023cc1e4bfffbe476729cee180978863c788..4768c3c4bb5ef9cf870c5154f7ae52428dabe5b2 100644 (file)
@@ -29,7 +29,7 @@
 
 #import <WebKit/WebPluginController.h>
 
-#import <WebKit/WebDocumentLoader.h>
+#import <WebCore/WebDocumentLoader.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebFrameView.h>
@@ -47,7 +47,7 @@
 #import <WebKit/WebViewInternal.h>
 #import <WebKit/WebUIDelegate.h>
 #import <WebKit/WebDataSourceInternal.h>
-#import <WebKit/WebFrameLoader.h>
+#import <WebCore/WebFrameLoader.h>
 
 #import <WebCore/WebCoreFrameBridge.h>
 
index 77e9837807ba191268cde3299876bc6cba18d254..54717510f971f0c960201e514c55330ed2b24e4b 100644 (file)
 #import "WebBasePluginPackage.h"
 #import "WebDataSourceInternal.h"
 #import "WebDefaultUIDelegate.h"
-#import "WebDocumentLoader.h"
+#import <WebCore/WebDocumentLoader.h>
 #import "WebEditingDelegate.h"
-#import "WebFormDataStream.h"
 #import "WebFormDelegate.h"
+#import <WebCore/WebFormDataStream.h>
 #import "WebFrameInternal.h"
-#import "WebFrameLoadDelegate.h"
-#import "WebFrameLoader.h"
+#import <WebKit/WebFrameLoadDelegate.h>
+#import <WebCore/WebFrameLoader.h>
 #import "WebFrameViewInternal.h"
 #import "WebHTMLRepresentationPrivate.h"
 #import "WebHTMLViewInternal.h"
@@ -54,7 +54,7 @@
 #import "WebKitNSStringExtras.h"
 #import "WebKitStatisticsPrivate.h"
 #import "WebKitSystemBits.h"
-#import "WebLoader.h"
+#import <WebCore/WebLoader.h>
 #import "WebLocalizableStrings.h"
 #import "WebNSObjectExtras.h"
 #import "WebNSURLExtras.h"
@@ -72,7 +72,7 @@
 #import "WebPreferencesPrivate.h"
 #import "WebResourcePrivate.h"
 #import "WebScriptDebugServerPrivate.h"
-#import "WebSubresourceLoader.h"
+#import <WebCore/WebSubresourceLoader.h>
 #import "WebUIDelegatePrivate.h"
 #import "WebViewInternal.h"
 #import <Foundation/NSURLConnection.h>
index b9a262bd9d600ba56a4f52c9ae0ff16ed120f176..cbbd6e1faff202230ca9651abcd2bfe095694e7d 100644 (file)
                51E4D39A0A886B5E00ECEE2C /* WebIconDatabaseBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E4D3980A886B5E00ECEE2C /* WebIconDatabaseBridge.m */; };
                650F74E409E488F70020118A /* WebUnarchivingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F74E209E488F70020118A /* WebUnarchivingState.h */; };
                650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 650F74E309E488F70020118A /* WebUnarchivingState.m */; };
-               651A93870A83F883007FEDF0 /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 651A93850A83F883007FEDF0 /* WebDataProtocol.h */; };
-               651A93880A83F883007FEDF0 /* WebDataProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 651A93860A83F883007FEDF0 /* WebDataProtocol.m */; };
-               6538B1C80A90596D00A07522 /* WebFormDataStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6538B1C60A90596D00A07522 /* WebFormDataStream.h */; };
-               6538B1C90A90596E00A07522 /* WebFormDataStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 6538B1C70A90596D00A07522 /* WebFormDataStream.m */; };
                65488DA1084FBCCB00831AD0 /* WebNSDictionaryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */; };
                65488DA2084FBCCB00831AD0 /* WebNSDictionaryExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */; };
-               654B3C330A82C47200E1AE3D /* WebFrameLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C290A82C47200E1AE3D /* WebFrameLoader.h */; };
-               654B3C340A82C47200E1AE3D /* WebFrameLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */; };
-               654B3C350A82C47200E1AE3D /* WebLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2B0A82C47200E1AE3D /* WebLoader.h */; };
-               654B3C360A82C47200E1AE3D /* WebLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2C0A82C47200E1AE3D /* WebLoader.m */; };
-               654B3C370A82C47200E1AE3D /* WebMainResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */; };
-               654B3C380A82C47200E1AE3D /* WebMainResourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */; };
-               654B3C390A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */; };
-               654B3C3A0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */; };
-               654B3C3B0A82C47200E1AE3D /* WebSubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */; };
-               654B3C3C0A82C47200E1AE3D /* WebSubresourceLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */; };
                6550B7C7099EFAE90090D781 /* WebArchiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B7C5099EFAE90090D781 /* WebArchiver.h */; };
                6550B7C8099EFAE90090D781 /* WebArchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 6550B7C6099EFAE90090D781 /* WebArchiver.m */; };
-               656D8B540ADA4EA400B34CBB /* WebFormState.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D8B520ADA4EA400B34CBB /* WebFormState.h */; };
-               656D8B550ADA4EA400B34CBB /* WebFormState.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D8B530ADA4EA400B34CBB /* WebFormState.m */; };
                658A40960A14853B005E6987 /* WebDataSourceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 658A40950A14853B005E6987 /* WebDataSourceInternal.h */; };
-               658BA6610ADB2D8900AEB387 /* WebPolicyDecider.h in Headers */ = {isa = PBXBuildFile; fileRef = 658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */; };
-               658BA6620ADB2D8900AEB387 /* WebPolicyDecider.m in Sources */ = {isa = PBXBuildFile; fileRef = 658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */; };
                658BA6FC0ADB39DE00AEB387 /* WebPolicyDeciderMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 658BA6FA0ADB39DE00AEB387 /* WebPolicyDeciderMac.h */; };
                658BA6FD0ADB39DE00AEB387 /* WebPolicyDeciderMac.m in Sources */ = {isa = PBXBuildFile; fileRef = 658BA6FB0ADB39DE00AEB387 /* WebPolicyDeciderMac.m */; };
-               659044280A9D3B4200E89459 /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 659044260A9D3B4200E89459 /* WebDocumentLoader.h */; };
-               659044290A9D3B4200E89459 /* WebDocumentLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 659044270A9D3B4200E89459 /* WebDocumentLoader.m */; };
                65A0006908527D1A005620FA /* libWebKitSystemInterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65A0006808527D1A005620FA /* libWebKitSystemInterface.a */; };
-               65A734610A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */; };
                65C7F42C0979DE640022E453 /* WebPageBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7F42A0979DE640022E453 /* WebPageBridge.h */; };
                65C7F42D0979DE640022E453 /* WebPageBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 65C7F42B0979DE640022E453 /* WebPageBridge.m */; };
                65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F88208500917007E5CB9 /* WebNSURLRequestExtras.h */; };
                65E0F88508500917007E5CB9 /* WebNSURLRequestExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E0F88308500917007E5CB9 /* WebNSURLRequestExtras.m */; };
                65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E0F9E408500F23007E5CB9 /* WebNSUserDefaultsExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65E0F9E708500F23007E5CB9 /* WebNSUserDefaultsExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E0F9E508500F23007E5CB9 /* WebNSUserDefaultsExtras.m */; };
-               65E1FDF90ADB8ED7003E1DC1 /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */; };
-               65E1FDFA0ADB8ED7003E1DC1 /* LoaderNSURLExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */; };
                65EEDE53084FFB920002DB25 /* WebNSCalendarDateExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EEDE51084FFB920002DB25 /* WebNSCalendarDateExtras.h */; };
                65EEDE54084FFB920002DB25 /* WebNSCalendarDateExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65EEDE52084FFB920002DB25 /* WebNSCalendarDateExtras.m */; };
                65EEDE57084FFC9E0002DB25 /* WebNSFileManagerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EEDE55084FFC9E0002DB25 /* WebNSFileManagerExtras.h */; };
@@ -87,7 +64,6 @@
                7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0508985A7200C44C3F /* WebScriptDebugDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEF0608985A7200C44C3F /* WebScriptDebugDelegate.m */; };
                7E6FEF0A08985A7200C44C3F /* WebScriptDebugDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E6FEF0708985A7200C44C3F /* WebScriptDebugDelegatePrivate.h */; };
-               930653940AD6FEF6008E969A /* WebFrameLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */; };
                939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
                939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Public, ); }; };
                939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
                51E94C6906C0347500A9B09E /* WebPDFRepresentation.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPDFRepresentation.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                650F74E209E488F70020118A /* WebUnarchivingState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebUnarchivingState.h; sourceTree = "<group>"; };
                650F74E309E488F70020118A /* WebUnarchivingState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebUnarchivingState.m; sourceTree = "<group>"; };
-               651A93850A83F883007FEDF0 /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
-               651A93860A83F883007FEDF0 /* WebDataProtocol.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDataProtocol.m; sourceTree = "<group>"; };
-               6538B1C60A90596D00A07522 /* WebFormDataStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormDataStream.h; sourceTree = "<group>"; };
-               6538B1C70A90596D00A07522 /* WebFormDataStream.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormDataStream.m; sourceTree = "<group>"; };
                65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDictionaryExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSDictionaryExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               654B3C290A82C47200E1AE3D /* WebFrameLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFrameLoader.h; sourceTree = "<group>"; };
-               654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFrameLoader.m; sourceTree = "<group>"; };
-               654B3C2B0A82C47200E1AE3D /* WebLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebLoader.h; sourceTree = "<group>"; };
-               654B3C2C0A82C47200E1AE3D /* WebLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebLoader.m; sourceTree = "<group>"; };
-               654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebMainResourceLoader.h; sourceTree = "<group>"; };
-               654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebMainResourceLoader.m; sourceTree = "<group>"; };
-               654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebNetscapePlugInStreamLoader.h; sourceTree = "<group>"; };
-               654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePlugInStreamLoader.m; sourceTree = "<group>"; };
-               654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebSubresourceLoader.h; sourceTree = "<group>"; };
-               654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebSubresourceLoader.m; sourceTree = "<group>"; };
                6550B7C5099EFAE90090D781 /* WebArchiver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebArchiver.h; sourceTree = "<group>"; };
                6550B7C6099EFAE90090D781 /* WebArchiver.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebArchiver.m; sourceTree = "<group>"; };
-               656D8B520ADA4EA400B34CBB /* WebFormState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFormState.h; sourceTree = "<group>"; };
-               656D8B530ADA4EA400B34CBB /* WebFormState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebFormState.m; sourceTree = "<group>"; };
                6578F5DE045F817400000128 /* WebDownload.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownload.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                6578F5DF045F817400000128 /* WebDownload.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDownload.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainerPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                658A40950A14853B005E6987 /* WebDataSourceInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataSourceInternal.h; sourceTree = "<group>"; };
-               658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDecider.h; sourceTree = "<group>"; };
-               658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDecider.m; sourceTree = "<group>"; };
                658BA6FA0ADB39DE00AEB387 /* WebPolicyDeciderMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPolicyDeciderMac.h; sourceTree = "<group>"; };
                658BA6FB0ADB39DE00AEB387 /* WebPolicyDeciderMac.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPolicyDeciderMac.m; sourceTree = "<group>"; };
-               659044260A9D3B4200E89459 /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
-               659044270A9D3B4200E89459 /* WebDocumentLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDocumentLoader.m; sourceTree = "<group>"; };
                65A0006808527D1A005620FA /* libWebKitSystemInterface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWebKitSystemInterface.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
                65A7D44A0568AB2600E70EF6 /* WebUIDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebUIDelegatePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65C7F42A0979DE640022E453 /* WebPageBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPageBridge.h; sourceTree = "<group>"; };
                65C7F42B0979DE640022E453 /* WebPageBridge.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebPageBridge.m; sourceTree = "<group>"; };
                65E0F9E508500F23007E5CB9 /* WebNSUserDefaultsExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSUserDefaultsExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginContainerCheck.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65E1150407EFFEBF009B8BF7 /* WebPluginContainerCheck.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginContainerCheck.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LoaderNSURLExtras.h; sourceTree = "<group>"; };
-               65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LoaderNSURLExtras.m; sourceTree = "<group>"; };
                65EEDE51084FFB920002DB25 /* WebNSCalendarDateExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSCalendarDateExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65EEDE52084FFB920002DB25 /* WebNSCalendarDateExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSCalendarDateExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65EEDE55084FFC9E0002DB25 /* WebNSFileManagerExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSFileManagerExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84D4BFF70348EF7600CA2ACA /* WebNetscapePluginEmbeddedView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEmbeddedView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84D4BFF80348EF7600CA2ACA /* WebNetscapePluginEmbeddedView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNetscapePluginEmbeddedView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9305892A070868B300E79D96 /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameLoaderClient.h; sourceTree = "<group>"; };
                930D02BB06275F640076701E /* WebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                930D02BD06275F710076701E /* WebFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93154EF103A41270008635CE /* WebPanelAuthenticationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPanelAuthenticationHandler.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                F52CA6C002DF9D78018635CA /* Download */,
                                F57D194A034E732C01A80180 /* DOM */,
                                25A8176801B5474B0ECA149E /* History */,
-                               654B3C280A82C47200E1AE3D /* Loader */,
                                254DC334016E1D3F0ECA149E /* Misc */,
                                F8CA15B4029A399401000122 /* Panels */,
                                F5EBC45202134BB601CA1520 /* Plugins */,
                        path = DefaultDelegates;
                        sourceTree = "<group>";
                };
-               654B3C280A82C47200E1AE3D /* Loader */ = {
-                       isa = PBXGroup;
-                       children = (
-                               65E1FDF70ADB8ED7003E1DC1 /* LoaderNSURLExtras.h */,
-                               65E1FDF80ADB8ED7003E1DC1 /* LoaderNSURLExtras.m */,
-                               651A93850A83F883007FEDF0 /* WebDataProtocol.h */,
-                               651A93860A83F883007FEDF0 /* WebDataProtocol.m */,
-                               659044260A9D3B4200E89459 /* WebDocumentLoader.h */,
-                               659044270A9D3B4200E89459 /* WebDocumentLoader.m */,
-                               6538B1C60A90596D00A07522 /* WebFormDataStream.h */,
-                               6538B1C70A90596D00A07522 /* WebFormDataStream.m */,
-                               656D8B520ADA4EA400B34CBB /* WebFormState.h */,
-                               656D8B530ADA4EA400B34CBB /* WebFormState.m */,
-                               654B3C290A82C47200E1AE3D /* WebFrameLoader.h */,
-                               654B3C2A0A82C47200E1AE3D /* WebFrameLoader.m */,
-                               930653930AD6FEF6008E969A /* WebFrameLoaderClient.h */,
-                               654B3C2B0A82C47200E1AE3D /* WebLoader.h */,
-                               654B3C2C0A82C47200E1AE3D /* WebLoader.m */,
-                               654B3C2D0A82C47200E1AE3D /* WebMainResourceLoader.h */,
-                               654B3C2E0A82C47200E1AE3D /* WebMainResourceLoader.m */,
-                               654B3C2F0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h */,
-                               654B3C300A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m */,
-                               65A734600A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h */,
-                               658BA65F0ADB2D8900AEB387 /* WebPolicyDecider.h */,
-                               658BA6600ADB2D8900AEB387 /* WebPolicyDecider.m */,
-                               654B3C310A82C47200E1AE3D /* WebSubresourceLoader.h */,
-                               654B3C320A82C47200E1AE3D /* WebSubresourceLoader.m */,
-                       );
-                       path = Loader;
-                       sourceTree = "<group>";
-               };
                848DFF410365F6FB00CA2ACA /* Netscape Plug-ins */ = {
                        isa = PBXGroup;
                        children = (
                                DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */,
                                1C0706630A431E01001078F6 /* WebScriptDebugServer.h in Headers */,
                                1C07079A0A433E22001078F6 /* WebScriptDebugServerPrivate.h in Headers */,
-                               654B3C330A82C47200E1AE3D /* WebFrameLoader.h in Headers */,
-                               654B3C350A82C47200E1AE3D /* WebLoader.h in Headers */,
-                               654B3C370A82C47200E1AE3D /* WebMainResourceLoader.h in Headers */,
-                               654B3C390A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.h in Headers */,
-                               654B3C3B0A82C47200E1AE3D /* WebSubresourceLoader.h in Headers */,
-                               651A93870A83F883007FEDF0 /* WebDataProtocol.h in Headers */,
                                51E4D3990A886B5E00ECEE2C /* WebIconDatabaseBridge.h in Headers */,
-                               6538B1C80A90596D00A07522 /* WebFormDataStream.h in Headers */,
-                               65A734610A923948001B57E8 /* WebPlugInStreamLoaderDelegate.h in Headers */,
-                               659044280A9D3B4200E89459 /* WebDocumentLoader.h in Headers */,
                                1C0D40870AC1C8F40009C113 /* WebKitVersionChecks.h in Headers */,
                                65FFB7FC0AD0B7D30048CD05 /* WebDocumentLoaderMac.h in Headers */,
-                               930653940AD6FEF6008E969A /* WebFrameLoaderClient.h in Headers */,
-                               656D8B540ADA4EA400B34CBB /* WebFormState.h in Headers */,
-                               658BA6610ADB2D8900AEB387 /* WebPolicyDecider.h in Headers */,
                                658BA6FC0ADB39DE00AEB387 /* WebPolicyDeciderMac.h in Headers */,
                                51B2A1000ADB15D0002A9BEE /* WebIconDatabaseDelegate.h in Headers */,
-                               65E1FDF90ADB8ED7003E1DC1 /* LoaderNSURLExtras.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */,
                                93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */,
                                1C07073D0A433BD8001078F6 /* WebScriptDebugServer.m in Sources */,
-                               654B3C340A82C47200E1AE3D /* WebFrameLoader.m in Sources */,
-                               654B3C360A82C47200E1AE3D /* WebLoader.m in Sources */,
-                               654B3C380A82C47200E1AE3D /* WebMainResourceLoader.m in Sources */,
-                               654B3C3A0A82C47200E1AE3D /* WebNetscapePlugInStreamLoader.m in Sources */,
-                               654B3C3C0A82C47200E1AE3D /* WebSubresourceLoader.m in Sources */,
-                               651A93880A83F883007FEDF0 /* WebDataProtocol.m in Sources */,
                                51E4D39A0A886B5E00ECEE2C /* WebIconDatabaseBridge.m in Sources */,
-                               6538B1C90A90596E00A07522 /* WebFormDataStream.m in Sources */,
-                               659044290A9D3B4200E89459 /* WebDocumentLoader.m in Sources */,
                                1C0D40880AC1C8F40009C113 /* WebKitVersionChecks.m in Sources */,
                                65FFB7FD0AD0B7D30048CD05 /* WebDocumentLoaderMac.m in Sources */,
-                               656D8B550ADA4EA400B34CBB /* WebFormState.m in Sources */,
-                               658BA6620ADB2D8900AEB387 /* WebPolicyDecider.m in Sources */,
                                658BA6FD0ADB39DE00AEB387 /* WebPolicyDeciderMac.m in Sources */,
-                               65E1FDFA0ADB8ED7003E1DC1 /* LoaderNSURLExtras.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 8e34d9d895bc02346b4a24d8a7805b9bdb0362e1..cc2a6647e9178431b86ed51279dd0521eb842f9d 100644 (file)
 
 #import "WebArchive.h"
 #import "WebArchiver.h"
-#import "WebDataProtocol.h"
-#import "WebDataSourceInternal.h"
+#import <WebCore/WebDataProtocol.h>
+#import <WebKit/WebDataSourceInternal.h>
 #import "WebDefaultResourceLoadDelegate.h"
 #import "WebDocument.h"
 #import "WebFrameBridge.h"
 #import "WebFrameInternal.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
 #import "WebFrameLoadDelegate.h"
 #import "WebHTMLRepresentation.h"
 #import "WebKitErrorsPrivate.h"
index e511e186294c5d201a9b5e4153391204c3729751..b782b87e0c223c0f04304e221a02e98f2b739695 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocumentLoader.h>
+#import <WebCore/WebDocumentLoader.h>
 
 @class WebDataSource;
 
index ed5a411e1a8c8978c821c2294c42c99a529e6672..dbdc377c011ba8396cc84a703571281fdab7b406 100644 (file)
 
 #import "WebArchive.h"
 #import "WebBackForwardList.h"
-#import "WebDataProtocol.h"
+#import <WebCore/WebDataProtocol.h>
 #import "WebDataSourceInternal.h"
 #import "WebDefaultResourceLoadDelegate.h"
 #import "WebDefaultUIDelegate.h"
 #import "WebDocumentInternal.h"
 #import "WebDocumentLoaderMac.h"
 #import "WebDownloadInternal.h"
-#import "WebFormDataStream.h"
+#import <WebCore/WebFormDataStream.h>
 #import "WebFrameBridge.h"
 #import "WebFrameLoadDelegate.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
 #import "WebFrameViewInternal.h"
 #import "WebHTMLRepresentationPrivate.h"
 #import "WebHTMLViewInternal.h"
@@ -51,7 +51,7 @@
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
 #import "WebKitStatisticsPrivate.h"
-#import "WebLoader.h"
+#import <WebCore/WebLoader.h>
 #import "WebNSDictionaryExtras.h"
 #import "WebNSObjectExtras.h"
 #import "WebNSURLExtras.h"
index 35bdad2ef2a2e9d7de825e941608197cf1d8057e..b17f2406870608dcb717f578ae1a9135de31c0c9 100644 (file)
 
 #import "WebFramePrivate.h"
 
-#import "WebFrameLoaderClient.h"
+#import <WebCore/WebFrameLoaderClient.h>
+#import <WebCore/WebFrameLoader.h>
 #import "WebPolicyDelegatePrivate.h"
 
-#import "WebFrameLoader.h"
 
 @class WebDocumentLoader;
 @class WebInspector;
index 4d48cc593c758c51e553c4d1b99cffce06626d0f..d343ae106c549f23aea89caf22111348867cac96 100644 (file)
@@ -37,7 +37,7 @@
 #import <WebKit/WebBaseNetscapePluginViewInternal.h>
 #import <WebKit/WebFrameBridge.h>
 #import <WebKit/WebClipView.h>
-#import <WebKit/WebDataProtocol.h>
+#import <WebCore/WebDataProtocol.h>
 #import <WebKit/WebDataSourceInternal.h>
 #import <WebKit/WebDefaultUIDelegate.h>
 #import <WebKit/WebDocumentInternal.h>
index 110ca19c5669039122523d1746dd3b1ac0329dc8..e8c49560ff110f4c4559cb2db7ca35179998cf92 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebPolicyDecider.h"
+#import <WebCore/WebPolicyDecider.h>
 
 @class WebPolicyDecisionListener;
 
index a1f91e9f14b334c7a2bc574b3ce6c48b42fa7a01..8e34b4833a843c979542dd72285c93d6bc68bdad 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import "WebPolicyDelegatePrivate.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
 
 #import <objc/objc-runtime.h>
 
index c6d072228b78b13496b63c47b0796af59bf5fb15..62841ad5f7cdbda6ad461a6fc930868be39f8e6d 100644 (file)
@@ -34,7 +34,7 @@
 #import "WebBaseNetscapePluginView.h"
 #import "WebDOMOperationsPrivate.h"
 #import "WebDashboardRegion.h"
-#import "WebDataProtocol.h"
+#import <WebCore/WebDataProtocol.h>
 #import "WebDataSourceInternal.h"
 #import "WebDefaultEditingDelegate.h"
 #import "WebDefaultFrameLoadDelegate.h"
@@ -44,7 +44,7 @@
 #import "WebDefaultUIDelegate.h"
 #import "WebDocument.h"
 #import "WebDocumentInternal.h"
-#import "WebDocumentLoader.h"
+#import <WebCore/WebDocumentLoader.h>
 #import "WebDownload.h"
 #import "WebDownloadInternal.h"
 #import "WebDynamicScrollBarsView.h"
@@ -52,7 +52,7 @@
 #import "WebFormDelegatePrivate.h"
 #import "WebFrameBridge.h"
 #import "WebFrameInternal.h"
-#import "WebFrameLoader.h"
+#import <WebCore/WebFrameLoader.h>
 #import "WebFrameViewInternal.h"
 #import "WebHTMLRepresentation.h"
 #import "WebHTMLViewInternal.h"