2011-01-03 Pratik Solanki <psolanki@apple.com>
authorpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jan 2011 23:45:12 +0000 (23:45 +0000)
committerpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jan 2011 23:45:12 +0000 (23:45 +0000)
        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=51850
        Put CFNetwork loader code inside USE(CFNETWORK)

        Add USE(CFNETWORK) macros around all the cf/mac network files. Also added all CFNetwork
        files to the WebCore Xcode project.

        * WebCore.xcodeproj/project.pbxproj:
        * loader/cf/ResourceLoaderCFNet.cpp:
        * loader/mac/ResourceLoaderMac.mm:
        * platform/network/cf/AuthenticationCF.cpp:
        * platform/network/cf/AuthenticationCF.h:
        * platform/network/cf/CookieJarCFNet.cpp:
        * platform/network/cf/CookieStorageCFNet.cpp:
        * platform/network/cf/CookieStorageCFNet.h:
        * platform/network/cf/CredentialStorageCFNet.cpp:
        * platform/network/cf/FormDataStreamCFNet.cpp:
        * platform/network/cf/FormDataStreamCFNet.h:
        * platform/network/cf/LoaderRunLoopCF.cpp:
        * platform/network/cf/LoaderRunLoopCF.h:
        * platform/network/cf/ResourceError.h:
        * platform/network/cf/ResourceHandleCFNet.cpp:
        * platform/network/cf/ResourceRequest.h:
        * platform/network/cf/ResourceRequestCFNet.cpp:
        * platform/network/cf/ResourceRequestCFNet.h:
        * platform/network/cf/ResourceResponse.h:
        * platform/network/cf/ResourceResponseCFNet.cpp:
        * platform/network/mac/AuthenticationMac.h:
        * platform/network/mac/AuthenticationMac.mm:
        * platform/network/mac/FormDataStreamMac.h:
        * platform/network/mac/FormDataStreamMac.mm:
        * platform/network/mac/ResourceError.h:
        * platform/network/mac/ResourceHandleMac.mm:
        * platform/network/mac/ResourceRequest.h:
        * platform/network/mac/ResourceRequestMac.mm:
        * platform/network/mac/ResourceResponse.h:
        * platform/network/mac/ResourceResponseMac.mm:

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

31 files changed:
WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/loader/cf/ResourceLoaderCFNet.cpp
WebCore/loader/mac/ResourceLoaderMac.mm
WebCore/platform/network/cf/AuthenticationCF.cpp
WebCore/platform/network/cf/AuthenticationCF.h
WebCore/platform/network/cf/CookieJarCFNet.cpp
WebCore/platform/network/cf/CookieStorageCFNet.cpp
WebCore/platform/network/cf/CookieStorageCFNet.h
WebCore/platform/network/cf/CredentialStorageCFNet.cpp
WebCore/platform/network/cf/FormDataStreamCFNet.cpp
WebCore/platform/network/cf/FormDataStreamCFNet.h
WebCore/platform/network/cf/LoaderRunLoopCF.cpp
WebCore/platform/network/cf/LoaderRunLoopCF.h
WebCore/platform/network/cf/ResourceError.h
WebCore/platform/network/cf/ResourceHandleCFNet.cpp
WebCore/platform/network/cf/ResourceRequest.h
WebCore/platform/network/cf/ResourceRequestCFNet.cpp
WebCore/platform/network/cf/ResourceRequestCFNet.h
WebCore/platform/network/cf/ResourceResponse.h
WebCore/platform/network/cf/ResourceResponseCFNet.cpp
WebCore/platform/network/mac/AuthenticationMac.h
WebCore/platform/network/mac/AuthenticationMac.mm
WebCore/platform/network/mac/FormDataStreamMac.h
WebCore/platform/network/mac/FormDataStreamMac.mm
WebCore/platform/network/mac/ResourceError.h
WebCore/platform/network/mac/ResourceHandleMac.mm
WebCore/platform/network/mac/ResourceRequest.h
WebCore/platform/network/mac/ResourceRequestMac.mm
WebCore/platform/network/mac/ResourceResponse.h
WebCore/platform/network/mac/ResourceResponseMac.mm

index f29a71c4e39c03654849360f91a18d625913ced8..4c4fbc1dcc39c9e746aee3a12f43f4aa73a2704a 100644 (file)
@@ -1,3 +1,44 @@
+2011-01-03  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51850
+        Put CFNetwork loader code inside USE(CFNETWORK)
+
+        Add USE(CFNETWORK) macros around all the cf/mac network files. Also added all CFNetwork
+        files to the WebCore Xcode project.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/cf/ResourceLoaderCFNet.cpp:
+        * loader/mac/ResourceLoaderMac.mm:
+        * platform/network/cf/AuthenticationCF.cpp:
+        * platform/network/cf/AuthenticationCF.h:
+        * platform/network/cf/CookieJarCFNet.cpp:
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        * platform/network/cf/CookieStorageCFNet.h:
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        * platform/network/cf/FormDataStreamCFNet.h:
+        * platform/network/cf/LoaderRunLoopCF.cpp:
+        * platform/network/cf/LoaderRunLoopCF.h:
+        * platform/network/cf/ResourceError.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/network/cf/ResourceRequest.h:
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        * platform/network/cf/ResourceRequestCFNet.h:
+        * platform/network/cf/ResourceResponse.h:
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        * platform/network/mac/AuthenticationMac.h:
+        * platform/network/mac/AuthenticationMac.mm:
+        * platform/network/mac/FormDataStreamMac.h:
+        * platform/network/mac/FormDataStreamMac.mm:
+        * platform/network/mac/ResourceError.h:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/network/mac/ResourceRequest.h:
+        * platform/network/mac/ResourceRequestMac.mm:
+        * platform/network/mac/ResourceResponse.h:
+        * platform/network/mac/ResourceResponseMac.mm:
+
 2011-01-03  Yi Shen  <yi.4.shen@nokia.com>
 
         Reviewed by Adam Barth.
index 4c1e5d2f22bcc878816bd7e2c905587ad99a7920..9781ea19ad5559b67e0e24832d5ef9fdccfd20a7 100644 (file)
                7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7E33CD01127F340D00BE8F17 /* PurgePriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E33CD00127F340D00BE8F17 /* PurgePriority.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */; };
+               7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */; };
+               7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */; };
+               7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */; };
+               7EE6846312D26E3800E79415 /* CookieStorageCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */; };
+               7EE6846412D26E3800E79415 /* CookieStorageCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */; };
+               7EE6846512D26E3800E79415 /* CredentialStorageCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */; };
+               7EE6846612D26E3800E79415 /* FormDataStreamCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */; };
+               7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */; };
+               7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */; };
+               7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */; };
+               7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845712D26E3800E79415 /* ResourceError.h */; };
+               7EE6846B12D26E3800E79415 /* ResourceErrorCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */; };
+               7EE6846C12D26E3800E79415 /* ResourceHandleCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */; };
+               7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845A12D26E3800E79415 /* ResourceRequest.h */; };
+               7EE6846E12D26E3800E79415 /* ResourceRequestCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */; };
+               7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */; };
+               7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845D12D26E3800E79415 /* ResourceResponse.h */; };
+               7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */; };
+               7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */; };
                81A7325E1210189B00FC0D9E /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A7325D1210189B00FC0D9E /* IDBCursor.h */; };
                81A73260121018A400FC0D9E /* IDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A7325F121018A400FC0D9E /* IDBCursor.cpp */; };
                81A73278121019E100FC0D9E /* IDBCursorBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A73277121019E100FC0D9E /* IDBCursorBackendImpl.h */; };
                7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
                7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
                7E33CD00127F340D00BE8F17 /* PurgePriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgePriority.h; sourceTree = "<group>"; };
+               7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
+               7EE6844D12D26E3800E79415 /* AuthenticationCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationCF.h; sourceTree = "<group>"; };
+               7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallenge.h; sourceTree = "<group>"; };
+               7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieJarCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookieStorageCFNet.h; sourceTree = "<group>"; };
+               7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialStorageCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataStreamCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataStreamCFNet.h; sourceTree = "<group>"; };
+               7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderRunLoopCF.cpp; sourceTree = "<group>"; };
+               7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderRunLoopCF.h; sourceTree = "<group>"; };
+               7EE6845712D26E3800E79415 /* ResourceError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceError.h; sourceTree = "<group>"; };
+               7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceErrorCF.cpp; sourceTree = "<group>"; };
+               7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845A12D26E3800E79415 /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
+               7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceRequestCFNet.cpp; sourceTree = "<group>"; };
+               7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequestCFNet.h; sourceTree = "<group>"; };
+               7EE6845D12D26E3800E79415 /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponse.h; sourceTree = "<group>"; };
+               7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; };
+               7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ResourceLoaderCFNet.cpp; path = cf/ResourceLoaderCFNet.cpp; sourceTree = "<group>"; };
                81A7325D1210189B00FC0D9E /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = "<group>"; };
                81A7325F121018A400FC0D9E /* IDBCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursor.cpp; sourceTree = "<group>"; };
                81A73277121019E100FC0D9E /* IDBCursorBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendImpl.h; sourceTree = "<group>"; };
                        tabWidth = 4;
                        usesTabs = 0;
                };
+               7EE6847312D26E5500E79415 /* cf */ = {
+                       isa = PBXGroup;
+                       children = (
+                               7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
+                       );
+                       name = cf;
+                       sourceTree = "<group>";
+               };
                850657040AAB476C002D15C0 /* StyleSheets */ = {
                        isa = PBXGroup;
                        children = (
                B2F34FE70E82F81700F627CD /* cf */ = {
                        isa = PBXGroup;
                        children = (
+                               7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */,
+                               7EE6844D12D26E3800E79415 /* AuthenticationCF.h */,
+                               7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */,
+                               7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */,
+                               7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */,
+                               7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */,
+                               7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */,
                                B2F34FE80E82F82700F627CD /* DNSCFNet.cpp */,
+                               7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
+                               7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
+                               7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */,
+                               7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */,
                                1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
+                               7EE6845712D26E3800E79415 /* ResourceError.h */,
+                               7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */,
+                               7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */,
+                               7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
+                               7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
+                               7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
+                               7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
+                               7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
                                51ABAE1A103C18FF008C5260 /* SocketStreamError.h */,
                                51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */,
                                51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */,
                                1A8F6BB00DB55CDC001DB794 /* appcache */,
                                512DD8E80D91E691000F89EE /* archive */,
                                A8D2B2521287A56000AF4DDA /* cache */,
+                               7EE6847312D26E5500E79415 /* cf */,
                                5126E6B60A2E3AEF005C29FA /* icon */,
                                93A1EAA20A5634D8006960A0 /* mac */,
                                E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */,
                                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
+                               7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
+                               7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
+                               7EE6846412D26E3800E79415 /* CookieStorageCFNet.h in Headers */,
+                               7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */,
+                               7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
+                               7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */,
+                               7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */,
+                               7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */,
+                               7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
+                               7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */,
+                               7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */,
+                               7EE6846312D26E3800E79415 /* CookieStorageCFNet.cpp in Sources */,
+                               7EE6846512D26E3800E79415 /* CredentialStorageCFNet.cpp in Sources */,
+                               7EE6846612D26E3800E79415 /* FormDataStreamCFNet.cpp in Sources */,
+                               7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */,
+                               7EE6846B12D26E3800E79415 /* ResourceErrorCF.cpp in Sources */,
+                               7EE6846C12D26E3800E79415 /* ResourceHandleCFNet.cpp in Sources */,
+                               7EE6846E12D26E3800E79415 /* ResourceRequestCFNet.cpp in Sources */,
+                               7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */,
+                               7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 83642c613ae88f567f1c54e13b47fbf2254b7525..833fdebf41dc73d7412f8a378e8103ad51b15865 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ResourceLoader.h"
 
+#if USE(CFNETWORK)
+
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 
@@ -42,3 +44,5 @@ bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef
 }
 
 } // namespace WebCore
+
+#endif // USE(CFNETWORK)
index 25fe7bd65b8680859b35a6074d7ce004a2f50354..38355172aff35bbd5c59031ce76f82dec2c06d80 100644 (file)
@@ -29,6 +29,8 @@
 #include "config.h"
 #include "ResourceLoader.h"
 
+#if !USE(CFNETWORK)
+
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "ResourceHandle.h"
@@ -43,3 +45,5 @@ NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCached
 }
 
 }
+
+#endif // !USE(CFNETWORK)
index 170d419b131e7ff4272f021ac7164a6be88a7f4b..5168a48a8c60d11b989ffa62930f113a4f6b1d9b 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "AuthenticationCF.h"
 
+#if USE(CFNETWORK)
+
 #include "AuthenticationChallenge.h"
 #include "AuthenticationClient.h"
 #include "Credential.h"
@@ -265,3 +267,5 @@ ProtectionSpace core(CFURLProtectionSpaceRef cfSpace)
 }
 
 };
+
+#endif // USE(CFNETWORK)
index b945ca1c2dfde471c736a0e5a1d209077fc85baf..0e34a56ce18a868f1e5906f1c85d33fe7a910e31 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef AuthenticationCF_h
 #define AuthenticationCF_h
 
+#if USE(CFNETWORK)
+
 #include <CFNetwork/CFURLCredentialPriv.h>
 
 typedef struct _CFURLAuthChallenge* CFURLAuthChallengeRef;
@@ -46,4 +48,6 @@ ProtectionSpace core(CFURLProtectionSpaceRef);
 
 }
 
-#endif
+#endif // USE(CFNETWORK)
+
+#endif // AuthenticationCF_h
index d3fc06dc511bad15a871c87254cda944f7147ea4..659b7198510f47f6df1965d603fc400df91737af 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "CookieJar.h"
 
+#if USE(CFNETWORK)
+
 #include "Cookie.h"
 #include "CookieStorageCFNet.h"
 #include "Document.h"
@@ -184,4 +186,6 @@ void deleteCookie(const Document*, const KURL& url, const String& name)
     }
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index 93819e1b93b37f5793dbd978ee55dca6f52f8bf2..3deb688d077621ec65a2f612fc41723155036c35 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "CookieStorageCFNet.h"
 
+#if USE(CFNETWORK)
+
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/MainThread.h>
@@ -61,4 +63,6 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled)
         s_cookieStorage = 0;
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index fc980c5c1e2c955dab02c473848f55434ed5e4bd..016758729cfe74daed8da861392584dec856509d 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef CookieStorageCFNet_h
 #define CookieStorageCFNet_h
 
+#if USE(CFNETWORK)
+
 typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
 
 namespace WebCore {
@@ -37,4 +39,6 @@ namespace WebCore {
 
 }
 
-#endif  // CookieStorageCFNet_h
+#endif // USE(CFNETWORK)
+
+#endif // CookieStorageCFNet_h
index 0a9e36f184433502243e5678c415286fcc3f4cf3..b6c997346c373f02ca852877f5111cab6b992759 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "CredentialStorage.h"
 
+#if USE(CFNETWORK)
+
 #include "AuthenticationCF.h"
 #include "Credential.h"
 #include "ProtectionSpace.h"
@@ -42,3 +44,5 @@ Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& pr
 }
 
 } // namespace WebCore
+
+#endif // USE(CFNETWORK)
index bba717d1a70eaab128ce68b07d48e76a9a07a19f..eb0ec3ae5eec1194821019dd4e3d6c65e2fec3c7 100644 (file)
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "FormDataStreamCFNet.h"
 
+#if USE(CFNETWORK)
+
 #include "FileSystem.h"
 #include "FormData.h"
 #include <CFNetwork/CFURLRequestPriv.h>
@@ -381,4 +383,6 @@ PassRefPtr<FormData> httpBodyFromRequest(CFURLRequestRef request)
     return 0;
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index e57a0d14d8c2e33b2986a89c0afb6f43f829854c..726003283bff47af065d76103ea1ca57333266e5 100644 (file)
@@ -29,6 +29,8 @@
 #ifndef FormDataStreamCFNet_h
 #define FormDataStreamCFNet_h
 
+#if USE(CFNETWORK)
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <wtf/Forward.h>
 
@@ -41,4 +43,6 @@ namespace WebCore {
     PassRefPtr<FormData> httpBodyFromRequest(CFURLRequestRef);
 }
 
-#endif FormDataStreamCFNet_h
+#endif // USE(CFNETWORK)
+
+#endif // FormDataStreamCFNet_h
index aa68916545acf643fb54bacf1bd75691b002d916..249fe43a3e1540df0fa730eb53fc6441eb18420b 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "LoaderRunLoopCF.h"
 
+#if USE(CFNETWORK)
+
 #include <wtf/Threading.h>
 
 namespace WebCore {
@@ -63,4 +65,6 @@ CFRunLoopRef loaderRunLoop()
     return loaderRunLoopObject;
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index 20e4c290202dc995ed509255eabb2dee366f0636..f66128cf20a35f3f364fe178c60b7b7436d0d875 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef LoaderRunLoopCF_h
 #define LoaderRunLoopCF_h
 
+#if USE(CFNETWORK)
+
 #if !PLATFORM(WIN)
 #error This code is not needed on platforms other than Windows, because main thread's CFRunLoop can be used.
 #endif
@@ -36,4 +38,6 @@ CFRunLoopRef loaderRunLoop();
 
 }
 
+#endif // USE(CFNETWORK)
+
 #endif // LoaderRunLoop_h
index 83f298ce3ccb8c692a0d9c4df6a459aefb6cc7ee..70c3fa5d5b86f65d110a86eab61bbfbb7fdb3510 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ResourceError_h
 #define ResourceError_h
 
+#if USE(CFNETWORK)
+
 #include "ResourceErrorBase.h"
 
 #include <wtf/RetainPtr.h>
@@ -70,4 +72,6 @@ private:
 
 } // namespace WebCore
 
+#endif // USE(CFNETWORK)
+
 #endif // ResourceError_h
index f0773d23bc8d99259389193daa15d3e83eba8adb..66ae5a0918609a357418926b24f26807645b279c 100644 (file)
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#if USE(CFNETWORK)
+
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
@@ -767,3 +769,5 @@ bool WebCoreSynchronousLoaderClient::shouldUseCredentialStorage(ResourceHandle*)
 }
 
 } // namespace WebCore
+
+#endif // USE(CFNETWORK)
index 0f330d1c166f9342484dd56f1a3ebea00369f279..ac1fb6b8e8daff997d9d390b7829a98881a512ef 100644 (file)
@@ -27,6 +27,8 @@
 #ifndef ResourceRequest_h
 #define ResourceRequest_h
 
+#if USE(CFNETWORK)
+
 #include "ResourceRequestBase.h"
 
 #include <wtf/RetainPtr.h>
@@ -80,4 +82,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
+#endif // USE(CFNETWORK)
+
 #endif // ResourceRequest_h
index 8e15040f4ce67f7c7da644b99eaa2610d33affc8..410a6498274eaa1352323fd5267eb4623b4c08df 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ResourceRequestCFNet.h"
 
+#if USE(CFNETWORK)
+
 #include "FormDataStreamCFNet.h"
 #include "ResourceRequest.h"
 
@@ -193,4 +195,6 @@ unsigned initializeMaximumHTTPConnectionCountPerHost()
     return wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
 }
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index e9ebe7697d0b0882899fe6e5952ecd9735c17d5a..39587a4ff10dd2d32594bd0971c9d23a0da8df02 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ResourceRequestCFNet_h
 #define ResourceRequestCFNet_h
 
+#if USE(CFNETWORK)
+
 typedef const struct _CFURLRequest* CFURLRequestRef;
 
 namespace WebCore {
@@ -36,4 +38,6 @@ namespace WebCore {
     CFURLRequestRef cfURLRequest(const ResourceRequest&);
 }
 
+#endif // USE(CFNETWORK)
+
 #endif // ResourceRequestCFNet_h
index a586a16dc0ef1a3a087ee516df92925d62d12e29..a46fc6f9dcf862b6d2a2bd91ccb5d02a350e184c 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ResourceResponse_h
 #define ResourceResponse_h
 
+#if USE(CFNETWORK)
+
 #include "ResourceResponseBase.h"
 #include <wtf/RetainPtr.h>
 
@@ -85,4 +87,6 @@ struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataB
 
 } // namespace WebCore
 
+#endif // USE(CFNETWORK)
+
 #endif // ResourceResponse_h
index 9a83add3537d182edb29dc0001ce1e915c5f8741..167b0793da1b1c9e600349422c59144f36cf27cd 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ResourceResponse.h"
 
+#if USE(CFNETWORK)
+
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
 #include <CFNetwork/CFURLResponsePriv.h>
@@ -113,4 +115,6 @@ bool ResourceResponse::platformCompare(const ResourceResponse& a, const Resource
 }
 
 
-}
+} // namespace WebCore
+
+#endif // USE(CFNETWORK)
index f55ac24a7f776804181f45dc8a3a1f68f592703d..9ab268e77940721e92e8da2d32b280451d818742 100644 (file)
@@ -25,6 +25,8 @@
 #ifndef AuthenticationMac_h
 #define AuthenticationMac_h
 
+#if !USE(CFNETWORK)
+
 #ifdef __OBJC__
 
 @class NSURLAuthenticationChallenge;
@@ -46,6 +48,8 @@ ProtectionSpace core(NSURLProtectionSpace *);
 Credential core(NSURLCredential *);
 
 }
-#endif
+#endif // __OBJC__
+
+#endif // !USE(CFNETWORK)
 
-#endif
+#endif // AuthenticationMac_h
index cdf643fb3c26a3ec775ce55e5fd48432e6c33029..efa42d9efbce2d5ef6e7a16a3719a9eb57124b6d 100644 (file)
@@ -25,6 +25,8 @@
 #import "config.h"
 #import "AuthenticationMac.h"
 
+#if !USE(CFNETWORK)
+
 #import "AuthenticationChallenge.h"
 #import "AuthenticationClient.h"
 #import "Credential.h"
@@ -357,4 +359,6 @@ Credential core(NSURLCredential *macCredential)
     return Credential([macCredential user], [macCredential password], persistence);
 }
 
-};
+} // namespace WebCore
+
+#endif // !USE(CFNETWORK)
index 22cc8ce0a585c6dfa930e5dc996ee07aab00bceb..4bc996859a55a4e126d116ab851b4540915316ce 100644 (file)
@@ -29,6 +29,8 @@
 #ifndef FormDataStreamMac_h
 #define FormDataStreamMac_h
 
+#if !USE(CFNETWORK)
+
 #include "FormData.h"
 
 @class NSMutableURLRequest;
@@ -46,4 +48,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
+#endif // !USE(CFNETWORK)
+
 #endif // FormDataStreamMac_h
index 69af91ac826ff10dbf084b87b629da00f52707a3..03f45793e9db845c6d2617eed34963505ad9fdfa 100644 (file)
@@ -31,6 +31,8 @@
 #import "config.h"
 #import "FormDataStreamMac.h"
 
+#if !USE(CFNETWORK)
+
 #import "BlobRegistryImpl.h"
 #import "FileSystem.h"
 #import "FormData.h"
@@ -484,3 +486,5 @@ FormData* httpBodyFromStream(NSInputStream* stream)
 }
 
 } // namespace WebCore
+
+#endif // !USE(CFNETWORK)
index 2f779c944cec37b1c2e99b61793b1db9ab18dbb1..c05539e9c962c7cdf4a505a22bc3ac87f3b083bd 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ResourceError_h
 #define ResourceError_h
 
+#if !USE(CFNETWORK)
+
 #include "ResourceErrorBase.h"
 #include <wtf/RetainPtr.h>
 
@@ -71,4 +73,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
+#endif // !USE(CFNETWORK)
+
 #endif // ResourceError_h_
index caa33d7edd23942e993f486c823349cd84390fab..84b656cebffc22bb9cef2c78c8c6c51f78dd9f7d 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ResourceHandleInternal.h"
 
+#if !USE(CFNETWORK)
+
 #import "AuthenticationChallenge.h"
 #import "AuthenticationMac.h"
 #import "Base64.h"
@@ -1074,4 +1076,6 @@ void WebCoreSynchronousLoaderClient::didFail(ResourceHandle*, const ResourceErro
     m_isDone = true;
 }
 
-#endif
+#endif // BUILDING_ON_TIGER
+
+#endif // !USE(CFNETWORK)
index ea0d13a666c9d9dac60e53d669a71dac77650c26..9b1d788dec0f6a8f8489f23de25633bd3cca4fe0 100644 (file)
@@ -27,6 +27,8 @@
 #ifndef ResourceRequest_h
 #define ResourceRequest_h
 
+#if !USE(CFNETWORK)
+
 #include "ResourceRequestBase.h"
 
 #include <wtf/RetainPtr.h>
@@ -85,4 +87,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
+#endif // !USE(CFNETWORK)
+
 #endif // ResourceRequest_h
index c2ad7d1524d09c2b434cf02f159cc9dfdb155c6d..f0357e52505bce394bbf42eed36bf0e3f24d313e 100644 (file)
@@ -25,6 +25,9 @@
 
 #import "config.h"
 #import "ResourceRequest.h"
+
+#if !USE(CFNETWORK)
+
 #import "WebCoreSystemInterface.h"
 
 #import "FormDataStreamMac.h"
@@ -158,4 +161,6 @@ unsigned initializeMaximumHTTPConnectionCountPerHost()
     return wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
 }
 
-}
+} // namespace WebCore
+
+#endif // !USE(CFNETWORK)
index 2867e9fd0d6d563caf4421470a065f5159000eb8..7ef443bbdca4f93825095b4420ba07acc89e64cc 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ResourceResponse_h
 #define ResourceResponse_h
 
+#if !USE(CFNETWORK)
+
 #include "ResourceResponseBase.h"
 #include <wtf/RetainPtr.h>
 
@@ -90,4 +92,6 @@ struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataB
 
 } // namespace WebCore
 
+#endif // !USE(CFNETWORK)
+
 #endif // ResourceResponse_h
index 4376b64985bd465781b1a3386a6aed116fb79271..58c36411d7b4c5f7ee73e203ca79b4e96e3f3dd7 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ResourceResponse.h"
 
+#if !USE(CFNETWORK)
+
 #import "HTTPParsers.h"
 #import "WebCoreURLResponse.h"
 #import "WebCoreSystemInterface.h"
@@ -106,4 +108,6 @@ bool ResourceResponse::platformCompare(const ResourceResponse& a, const Resource
     return a.nsURLResponse() == b.nsURLResponse();
 }
 
-}
+} // namespace WebCore
+
+#endif // !USE(CFNETWORK)