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:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f29a71c..4c4fbc1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 4c1e5d2..9781ea1 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1612,6 +1612,26 @@
                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 */; };
@@ -7992,6 +8012,26 @@
                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>"; };
@@ -13870,6 +13910,14 @@
                        tabWidth = 4;
                        usesTabs = 0;
                };
+               7EE6847312D26E5500E79415 /* cf */ = {
+                       isa = PBXGroup;
+                       children = (
+                               7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
+                       );
+                       name = cf;
+                       sourceTree = "<group>";
+               };
                850657040AAB476C002D15C0 /* StyleSheets */ = {
                        isa = PBXGroup;
                        children = (
@@ -17364,8 +17412,27 @@
                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 */,
@@ -17813,6 +17880,7 @@
                                1A8F6BB00DB55CDC001DB794 /* appcache */,
                                512DD8E80D91E691000F89EE /* archive */,
                                A8D2B2521287A56000AF4DDA /* cache */,
+                               7EE6847312D26E5500E79415 /* cf */,
                                5126E6B60A2E3AEF005C29FA /* icon */,
                                93A1EAA20A5634D8006960A0 /* mac */,
                                E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */,
@@ -22197,6 +22265,15 @@
                                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;
                };
@@ -24866,6 +24943,17 @@
                                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;
                };

diff --git a/WebCore/loader/cf/ResourceLoaderCFNet.cpp b/WebCore/loader/cf/ResourceLoaderCFNet.cpp
index 83642c6..833fdeb 100644 (file)
--- a/WebCore/loader/cf/ResourceLoaderCFNet.cpp
+++ b/WebCore/loader/cf/ResourceLoaderCFNet.cpp
@@ -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)

diff --git a/WebCore/loader/mac/ResourceLoaderMac.mm b/WebCore/loader/mac/ResourceLoaderMac.mm
index 25fe7bd..3835517 100644 (file)
--- a/WebCore/loader/mac/ResourceLoaderMac.mm
+++ b/WebCore/loader/mac/ResourceLoaderMac.mm
@@ -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)

diff --git a/WebCore/platform/network/cf/AuthenticationCF.cpp b/WebCore/platform/network/cf/AuthenticationCF.cpp
index 170d419..5168a48 100644 (file)
--- a/WebCore/platform/network/cf/AuthenticationCF.cpp
+++ b/WebCore/platform/network/cf/AuthenticationCF.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/AuthenticationCF.h b/WebCore/platform/network/cf/AuthenticationCF.h
index b945ca1..0e34a56 100644 (file)
--- a/WebCore/platform/network/cf/AuthenticationCF.h
+++ b/WebCore/platform/network/cf/AuthenticationCF.h
@@ -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

diff --git a/WebCore/platform/network/cf/CookieJarCFNet.cpp b/WebCore/platform/network/cf/CookieJarCFNet.cpp
index d3fc06d..659b719 100644 (file)
--- a/WebCore/platform/network/cf/CookieJarCFNet.cpp
+++ b/WebCore/platform/network/cf/CookieJarCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/CookieStorageCFNet.cpp b/WebCore/platform/network/cf/CookieStorageCFNet.cpp
index 93819e1..3deb688 100644 (file)
--- a/WebCore/platform/network/cf/CookieStorageCFNet.cpp
+++ b/WebCore/platform/network/cf/CookieStorageCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/CookieStorageCFNet.h b/WebCore/platform/network/cf/CookieStorageCFNet.h
index fc980c5..0167587 100644 (file)
--- a/WebCore/platform/network/cf/CookieStorageCFNet.h
+++ b/WebCore/platform/network/cf/CookieStorageCFNet.h
@@ -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

diff --git a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
index 0a9e36f..b6c9973 100644 (file)
--- a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
+++ b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/FormDataStreamCFNet.cpp b/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
index bba717d..eb0ec3a 100644 (file)
--- a/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
+++ b/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/FormDataStreamCFNet.h b/WebCore/platform/network/cf/FormDataStreamCFNet.h
index e57a0d1..7260032 100644 (file)
--- a/WebCore/platform/network/cf/FormDataStreamCFNet.h
+++ b/WebCore/platform/network/cf/FormDataStreamCFNet.h
@@ -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

diff --git a/WebCore/platform/network/cf/LoaderRunLoopCF.cpp b/WebCore/platform/network/cf/LoaderRunLoopCF.cpp
index aa68916..249fe43 100644 (file)
--- a/WebCore/platform/network/cf/LoaderRunLoopCF.cpp
+++ b/WebCore/platform/network/cf/LoaderRunLoopCF.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/LoaderRunLoopCF.h b/WebCore/platform/network/cf/LoaderRunLoopCF.h
index 20e4c29..f66128c 100644 (file)
--- a/WebCore/platform/network/cf/LoaderRunLoopCF.h
+++ b/WebCore/platform/network/cf/LoaderRunLoopCF.h
@@ -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

diff --git a/WebCore/platform/network/cf/ResourceError.h b/WebCore/platform/network/cf/ResourceError.h
index 83f298c..70c3fa5 100644 (file)
--- a/WebCore/platform/network/cf/ResourceError.h
+++ b/WebCore/platform/network/cf/ResourceError.h
@@ -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

diff --git a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
index f0773d2..66ae5a0 100644 (file)
--- a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/ResourceRequest.h b/WebCore/platform/network/cf/ResourceRequest.h
index 0f330d1..ac1fb6b 100644 (file)
--- a/WebCore/platform/network/cf/ResourceRequest.h
+++ b/WebCore/platform/network/cf/ResourceRequest.h
@@ -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

diff --git a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
index 8e15040..410a649 100644 (file)
--- a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/cf/ResourceRequestCFNet.h b/WebCore/platform/network/cf/ResourceRequestCFNet.h
index e9ebe76..39587a4 100644 (file)
--- a/WebCore/platform/network/cf/ResourceRequestCFNet.h
+++ b/WebCore/platform/network/cf/ResourceRequestCFNet.h
@@ -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

diff --git a/WebCore/platform/network/cf/ResourceResponse.h b/WebCore/platform/network/cf/ResourceResponse.h
index a586a16..a46fc6f 100644 (file)
--- a/WebCore/platform/network/cf/ResourceResponse.h
+++ b/WebCore/platform/network/cf/ResourceResponse.h
@@ -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

diff --git a/WebCore/platform/network/cf/ResourceResponseCFNet.cpp b/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
index 9a83add..167b079 100644 (file)
--- a/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
@@ -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)

diff --git a/WebCore/platform/network/mac/AuthenticationMac.h b/WebCore/platform/network/mac/AuthenticationMac.h
index f55ac24..9ab268e 100644 (file)
--- a/WebCore/platform/network/mac/AuthenticationMac.h
+++ b/WebCore/platform/network/mac/AuthenticationMac.h
@@ -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

diff --git a/WebCore/platform/network/mac/AuthenticationMac.mm b/WebCore/platform/network/mac/AuthenticationMac.mm
index cdf643f..efa42d9 100644 (file)
--- a/WebCore/platform/network/mac/AuthenticationMac.mm
+++ b/WebCore/platform/network/mac/AuthenticationMac.mm
@@ -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)

diff --git a/WebCore/platform/network/mac/FormDataStreamMac.h b/WebCore/platform/network/mac/FormDataStreamMac.h
index 22cc8ce..4bc9968 100644 (file)
--- a/WebCore/platform/network/mac/FormDataStreamMac.h
+++ b/WebCore/platform/network/mac/FormDataStreamMac.h
@@ -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

diff --git a/WebCore/platform/network/mac/FormDataStreamMac.mm b/WebCore/platform/network/mac/FormDataStreamMac.mm
index 69af91a..03f4579 100644 (file)
--- a/WebCore/platform/network/mac/FormDataStreamMac.mm
+++ b/WebCore/platform/network/mac/FormDataStreamMac.mm
@@ -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)

diff --git a/WebCore/platform/network/mac/ResourceError.h b/WebCore/platform/network/mac/ResourceError.h
index 2f779c9..c05539e 100644 (file)
--- a/WebCore/platform/network/mac/ResourceError.h
+++ b/WebCore/platform/network/mac/ResourceError.h
@@ -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_

diff --git a/WebCore/platform/network/mac/ResourceHandleMac.mm b/WebCore/platform/network/mac/ResourceHandleMac.mm
index caa33d7..84b656c 100644 (file)
--- a/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -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)

diff --git a/WebCore/platform/network/mac/ResourceRequest.h b/WebCore/platform/network/mac/ResourceRequest.h
index ea0d13a..9b1d788 100644 (file)
--- a/WebCore/platform/network/mac/ResourceRequest.h
+++ b/WebCore/platform/network/mac/ResourceRequest.h
@@ -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

diff --git a/WebCore/platform/network/mac/ResourceRequestMac.mm b/WebCore/platform/network/mac/ResourceRequestMac.mm
index c2ad7d1..f0357e5 100644 (file)
--- a/WebCore/platform/network/mac/ResourceRequestMac.mm
+++ b/WebCore/platform/network/mac/ResourceRequestMac.mm
@@ -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)

diff --git a/WebCore/platform/network/mac/ResourceResponse.h b/WebCore/platform/network/mac/ResourceResponse.h
index 2867e9f..7ef443b 100644 (file)
--- a/WebCore/platform/network/mac/ResourceResponse.h
+++ b/WebCore/platform/network/mac/ResourceResponse.h
@@ -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

diff --git a/WebCore/platform/network/mac/ResourceResponseMac.mm b/WebCore/platform/network/mac/ResourceResponseMac.mm
index 4376b64..58c3641 100644 (file)
--- a/WebCore/platform/network/mac/ResourceResponseMac.mm
+++ b/WebCore/platform/network/mac/ResourceResponseMac.mm
@@ -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)