Changeset 74943 in webkit


Ignore:
Timestamp:
Jan 3, 2011 3:45:12 PM (13 years ago)
Author:
psolanki@apple.com
Message:

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:
Location:
trunk/WebCore
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r74941 r74943  
     12011-01-03  Pratik Solanki  <psolanki@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=51850
     6        Put CFNetwork loader code inside USE(CFNETWORK)
     7
     8        Add USE(CFNETWORK) macros around all the cf/mac network files. Also added all CFNetwork
     9        files to the WebCore Xcode project.
     10
     11        * WebCore.xcodeproj/project.pbxproj:
     12        * loader/cf/ResourceLoaderCFNet.cpp:
     13        * loader/mac/ResourceLoaderMac.mm:
     14        * platform/network/cf/AuthenticationCF.cpp:
     15        * platform/network/cf/AuthenticationCF.h:
     16        * platform/network/cf/CookieJarCFNet.cpp:
     17        * platform/network/cf/CookieStorageCFNet.cpp:
     18        * platform/network/cf/CookieStorageCFNet.h:
     19        * platform/network/cf/CredentialStorageCFNet.cpp:
     20        * platform/network/cf/FormDataStreamCFNet.cpp:
     21        * platform/network/cf/FormDataStreamCFNet.h:
     22        * platform/network/cf/LoaderRunLoopCF.cpp:
     23        * platform/network/cf/LoaderRunLoopCF.h:
     24        * platform/network/cf/ResourceError.h:
     25        * platform/network/cf/ResourceHandleCFNet.cpp:
     26        * platform/network/cf/ResourceRequest.h:
     27        * platform/network/cf/ResourceRequestCFNet.cpp:
     28        * platform/network/cf/ResourceRequestCFNet.h:
     29        * platform/network/cf/ResourceResponse.h:
     30        * platform/network/cf/ResourceResponseCFNet.cpp:
     31        * platform/network/mac/AuthenticationMac.h:
     32        * platform/network/mac/AuthenticationMac.mm:
     33        * platform/network/mac/FormDataStreamMac.h:
     34        * platform/network/mac/FormDataStreamMac.mm:
     35        * platform/network/mac/ResourceError.h:
     36        * platform/network/mac/ResourceHandleMac.mm:
     37        * platform/network/mac/ResourceRequest.h:
     38        * platform/network/mac/ResourceRequestMac.mm:
     39        * platform/network/mac/ResourceResponse.h:
     40        * platform/network/mac/ResourceResponseMac.mm:
     41
    1422011-01-03  Yi Shen  <yi.4.shen@nokia.com>
    243

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r74851 r74943  
    16131613                7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16141614                7E33CD01127F340D00BE8F17 /* PurgePriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E33CD00127F340D00BE8F17 /* PurgePriority.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1615                7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */; };
     1616                7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */; };
     1617                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */; };
     1618                7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */; };
     1619                7EE6846312D26E3800E79415 /* CookieStorageCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */; };
     1620                7EE6846412D26E3800E79415 /* CookieStorageCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */; };
     1621                7EE6846512D26E3800E79415 /* CredentialStorageCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */; };
     1622                7EE6846612D26E3800E79415 /* FormDataStreamCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */; };
     1623                7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */; };
     1624                7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */; };
     1625                7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */; };
     1626                7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845712D26E3800E79415 /* ResourceError.h */; };
     1627                7EE6846B12D26E3800E79415 /* ResourceErrorCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */; };
     1628                7EE6846C12D26E3800E79415 /* ResourceHandleCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */; };
     1629                7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845A12D26E3800E79415 /* ResourceRequest.h */; };
     1630                7EE6846E12D26E3800E79415 /* ResourceRequestCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */; };
     1631                7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */; };
     1632                7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845D12D26E3800E79415 /* ResourceResponse.h */; };
     1633                7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */; };
     1634                7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */; };
    16151635                81A7325E1210189B00FC0D9E /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A7325D1210189B00FC0D9E /* IDBCursor.h */; };
    16161636                81A73260121018A400FC0D9E /* IDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A7325F121018A400FC0D9E /* IDBCursor.cpp */; };
    … …  
    79938013                7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
    79948014                7E33CD00127F340D00BE8F17 /* PurgePriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgePriority.h; sourceTree = "<group>"; };
     8015                7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
     8016                7EE6844D12D26E3800E79415 /* AuthenticationCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationCF.h; sourceTree = "<group>"; };
     8017                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallenge.h; sourceTree = "<group>"; };
     8018                7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieJarCFNet.cpp; sourceTree = "<group>"; };
     8019                7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageCFNet.cpp; sourceTree = "<group>"; };
     8020                7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookieStorageCFNet.h; sourceTree = "<group>"; };
     8021                7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialStorageCFNet.cpp; sourceTree = "<group>"; };
     8022                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataStreamCFNet.cpp; sourceTree = "<group>"; };
     8023                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataStreamCFNet.h; sourceTree = "<group>"; };
     8024                7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderRunLoopCF.cpp; sourceTree = "<group>"; };
     8025                7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderRunLoopCF.h; sourceTree = "<group>"; };
     8026                7EE6845712D26E3800E79415 /* ResourceError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceError.h; sourceTree = "<group>"; };
     8027                7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceErrorCF.cpp; sourceTree = "<group>"; };
     8028                7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFNet.cpp; sourceTree = "<group>"; };
     8029                7EE6845A12D26E3800E79415 /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
     8030                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceRequestCFNet.cpp; sourceTree = "<group>"; };
     8031                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequestCFNet.h; sourceTree = "<group>"; };
     8032                7EE6845D12D26E3800E79415 /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponse.h; sourceTree = "<group>"; };
     8033                7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; };
     8034                7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ResourceLoaderCFNet.cpp; path = cf/ResourceLoaderCFNet.cpp; sourceTree = "<group>"; };
    79958035                81A7325D1210189B00FC0D9E /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = "<group>"; };
    79968036                81A7325F121018A400FC0D9E /* IDBCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursor.cpp; sourceTree = "<group>"; };
    … …  
    1387113911                        usesTabs = 0;
    1387213912                };
     13913                7EE6847312D26E5500E79415 /* cf */ = {
     13914                        isa = PBXGroup;
     13915                        children = (
     13916                                7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
     13917                        );
     13918                        name = cf;
     13919                        sourceTree = "<group>";
     13920                };
    1387313921                850657040AAB476C002D15C0 /* StyleSheets */ = {
    1387413922                        isa = PBXGroup;
    … …  
    1736517413                        isa = PBXGroup;
    1736617414                        children = (
     17415                                7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */,
     17416                                7EE6844D12D26E3800E79415 /* AuthenticationCF.h */,
     17417                                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */,
     17418                                7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */,
     17419                                7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */,
     17420                                7EE6845112D26E3800E79415 /* CookieStorageCFNet.h */,
     17421                                7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */,
    1736717422                                B2F34FE80E82F82700F627CD /* DNSCFNet.cpp */,
     17423                                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
     17424                                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
     17425                                7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */,
     17426                                7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */,
    1736817427                                1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
     17428                                7EE6845712D26E3800E79415 /* ResourceError.h */,
     17429                                7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */,
     17430                                7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */,
     17431                                7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
     17432                                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
     17433                                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
     17434                                7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
     17435                                7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
    1736917436                                51ABAE1A103C18FF008C5260 /* SocketStreamError.h */,
    1737017437                                51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */,
    … …  
    1781417881                                512DD8E80D91E691000F89EE /* archive */,
    1781517882                                A8D2B2521287A56000AF4DDA /* cache */,
     17883                                7EE6847312D26E5500E79415 /* cf */,
    1781617884                                5126E6B60A2E3AEF005C29FA /* icon */,
    1781717885                                93A1EAA20A5634D8006960A0 /* mac */,
    … …  
    2219822266                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    2219922267                                97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
     22268                                7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
     22269                                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
     22270                                7EE6846412D26E3800E79415 /* CookieStorageCFNet.h in Headers */,
     22271                                7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */,
     22272                                7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
     22273                                7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */,
     22274                                7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */,
     22275                                7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */,
     22276                                7EE6847012D26E3800E79415 /* ResourceResponse.h in Headers */,
    2220022277                        );
    2220122278                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2486724944                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
    2486824945                                97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
     24946                                7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */,
     24947                                7EE6846212D26E3800E79415 /* CookieJarCFNet.cpp in Sources */,
     24948                                7EE6846312D26E3800E79415 /* CookieStorageCFNet.cpp in Sources */,
     24949                                7EE6846512D26E3800E79415 /* CredentialStorageCFNet.cpp in Sources */,
     24950                                7EE6846612D26E3800E79415 /* FormDataStreamCFNet.cpp in Sources */,
     24951                                7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */,
     24952                                7EE6846B12D26E3800E79415 /* ResourceErrorCF.cpp in Sources */,
     24953                                7EE6846C12D26E3800E79415 /* ResourceHandleCFNet.cpp in Sources */,
     24954                                7EE6846E12D26E3800E79415 /* ResourceRequestCFNet.cpp in Sources */,
     24955                                7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */,
     24956                                7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */,
    2486924957                        );
    2487024958                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/loader/cf/ResourceLoaderCFNet.cpp

    r41773 r74943  
    2727#include "ResourceLoader.h"
    2828
     29#if USE(CFNETWORK)
     30
    2931#include "FrameLoader.h"
    3032#include "FrameLoaderClient.h"
    … …  
    4345
    4446} // namespace WebCore
     47
     48#endif // USE(CFNETWORK)

  • trunk/WebCore/loader/mac/ResourceLoaderMac.mm

    r41434 r74943  
    3030#include "ResourceLoader.h"
    3131
     32#if !USE(CFNETWORK)
     33
    3234#include "FrameLoader.h"
    3335#include "FrameLoaderClient.h"
    … …  
    4446
    4547}
     48
     49#endif // !USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/AuthenticationCF.cpp

    r57232 r74943  
    2727#include "AuthenticationCF.h"
    2828
     29#if USE(CFNETWORK)
     30
    2931#include "AuthenticationChallenge.h"
    3032#include "AuthenticationClient.h"
    … …  
    266268
    267269};
     270
     271#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/AuthenticationCF.h

    r61806 r74943  
    2727#define AuthenticationCF_h
    2828
     29#if USE(CFNETWORK)
     30
    2931#include <CFNetwork/CFURLCredentialPriv.h>
    3032
    … …  
    4749}
    4850
    49 #endif
     51#endif // USE(CFNETWORK)
     52
     53#endif // AuthenticationCF_h

  • trunk/WebCore/platform/network/cf/CookieJarCFNet.cpp

    r70339 r74943  
    2626#include "config.h"
    2727#include "CookieJar.h"
     28
     29#if USE(CFNETWORK)
    2830
    2931#include "Cookie.h"
    … …  
    185187}
    186188
    187 }
     189} // namespace WebCore
     190
     191#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/CookieStorageCFNet.cpp

    r70405 r74943  
    2626#include "config.h"
    2727#include "CookieStorageCFNet.h"
     28
     29#if USE(CFNETWORK)
    2830
    2931#include <CFNetwork/CFHTTPCookiesPriv.h>
    … …  
    6264}
    6365
    64 }
     66} // namespace WebCore
     67
     68#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/CookieStorageCFNet.h

    r70400 r74943  
    2727#define CookieStorageCFNet_h
    2828
     29#if USE(CFNETWORK)
     30
    2931typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
    3032
    … …  
    3840}
    3941
    40 #endif  // CookieStorageCFNet_h
     42#endif // USE(CFNETWORK)
     43
     44#endif // CookieStorageCFNet_h

  • trunk/WebCore/platform/network/cf/CredentialStorageCFNet.cpp

    r51565 r74943  
    2727#include "CredentialStorage.h"
    2828
     29#if USE(CFNETWORK)
     30
    2931#include "AuthenticationCF.h"
    3032#include "Credential.h"
    … …  
    4345
    4446} // namespace WebCore
     47
     48#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

    r56825 r74943  
    3232#include "FormDataStreamCFNet.h"
    3333
     34#if USE(CFNETWORK)
     35
    3436#include "FileSystem.h"
    3537#include "FormData.h"
    … …  
    382384}
    383385
    384 }
     386} // namespace WebCore
     387
     388#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/FormDataStreamCFNet.h

    r61663 r74943  
    3030#define FormDataStreamCFNet_h
    3131
     32#if USE(CFNETWORK)
     33
    3234#include <CoreFoundation/CoreFoundation.h>
    3335#include <wtf/Forward.h>
    … …  
    4244}
    4345
    44 #endif FormDataStreamCFNet_h
     46#endif // USE(CFNETWORK)
     47
     48#endif // FormDataStreamCFNet_h

  • trunk/WebCore/platform/network/cf/LoaderRunLoopCF.cpp

    r51222 r74943  
    2626#include "config.h"
    2727#include "LoaderRunLoopCF.h"
     28
     29#if USE(CFNETWORK)
    2830
    2931#include <wtf/Threading.h>
    … …  
    6466}
    6567
    66 }
     68} // namespace WebCore
     69
     70#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/LoaderRunLoopCF.h

    r51222 r74943  
    2727#define LoaderRunLoopCF_h
    2828
     29#if USE(CFNETWORK)
     30
    2931#if !PLATFORM(WIN)
    3032#error This code is not needed on platforms other than Windows, because main thread's CFRunLoop can be used.
    … …  
    3739}
    3840
     41#endif // USE(CFNETWORK)
     42
    3943#endif // LoaderRunLoop_h

  • trunk/WebCore/platform/network/cf/ResourceError.h

    r70339 r74943  
    2626#ifndef ResourceError_h
    2727#define ResourceError_h
     28
     29#if USE(CFNETWORK)
    2830
    2931#include "ResourceErrorBase.h"
    … …  
    7173} // namespace WebCore
    7274
     75#endif // USE(CFNETWORK)
     76
    7377#endif // ResourceError_h

  • trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r74084 r74943  
    2626#include "config.h"
    2727
     28#if USE(CFNETWORK)
     29
    2830#include "ResourceHandle.h"
    2931#include "ResourceHandleClient.h"
    … …  
    768770
    769771} // namespace WebCore
     772
     773#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/ResourceRequest.h

    r70339 r74943  
    2727#ifndef ResourceRequest_h
    2828#define ResourceRequest_h
     29
     30#if USE(CFNETWORK)
    2931
    3032#include "ResourceRequestBase.h"
    … …  
    8183} // namespace WebCore
    8284
     85#endif // USE(CFNETWORK)
     86
    8387#endif // ResourceRequest_h

  • trunk/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r63265 r74943  
    2727#include "ResourceRequestCFNet.h"
    2828
     29#if USE(CFNETWORK)
     30
    2931#include "FormDataStreamCFNet.h"
    3032#include "ResourceRequest.h"
    … …  
    194196}
    195197
    196 }
     198} // namespace WebCore
     199
     200#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/cf/ResourceRequestCFNet.h

    r50625 r74943  
    2727#define ResourceRequestCFNet_h
    2828
     29#if USE(CFNETWORK)
     30
    2931typedef const struct _CFURLRequest* CFURLRequestRef;
    3032
    … …  
    3739}
    3840
     41#endif // USE(CFNETWORK)
     42
    3943#endif // ResourceRequestCFNet_h

  • trunk/WebCore/platform/network/cf/ResourceResponse.h

    r70339 r74943  
    2626#ifndef ResourceResponse_h
    2727#define ResourceResponse_h
     28
     29#if USE(CFNETWORK)
    2830
    2931#include "ResourceResponseBase.h"
    … …  
    8688} // namespace WebCore
    8789
     90#endif // USE(CFNETWORK)
     91
    8892#endif // ResourceResponse_h

  • trunk/WebCore/platform/network/cf/ResourceResponseCFNet.cpp

    r73844 r74943  
    2626#include "config.h"
    2727#include "ResourceResponse.h"
     28
     29#if USE(CFNETWORK)
    2830
    2931#include "HTTPParsers.h"
    … …  
    114116
    115117
    116 }
     118} // namespace WebCore
     119
     120#endif // USE(CFNETWORK)

  • trunk/WebCore/platform/network/mac/AuthenticationMac.h

    r48363 r74943  
    2626#define AuthenticationMac_h
    2727
     28#if !USE(CFNETWORK)
     29
    2830#ifdef __OBJC__
    2931
    … …  
    4749
    4850}
    49 #endif
     51#endif // __OBJC__
    5052
    51 #endif
     53#endif // !USE(CFNETWORK)
     54
     55#endif // AuthenticationMac_h

  • trunk/WebCore/platform/network/mac/AuthenticationMac.mm

    r73281 r74943  
    2626#import "AuthenticationMac.h"
    2727
     28#if !USE(CFNETWORK)
     29
    2830#import "AuthenticationChallenge.h"
    2931#import "AuthenticationClient.h"
    … …  
    358360}
    359361
    360 };
     362} // namespace WebCore
     363
     364#endif // !USE(CFNETWORK)

  • trunk/WebCore/platform/network/mac/FormDataStreamMac.h

    r35435 r74943  
    3030#define FormDataStreamMac_h
    3131
     32#if !USE(CFNETWORK)
     33
    3234#include "FormData.h"
    3335
    … …  
    4749} // namespace WebCore
    4850
     51#endif // !USE(CFNETWORK)
     52
    4953#endif // FormDataStreamMac_h

  • trunk/WebCore/platform/network/mac/FormDataStreamMac.mm

    r70399 r74943  
    3232#import "FormDataStreamMac.h"
    3333
     34#if !USE(CFNETWORK)
     35
    3436#import "BlobRegistryImpl.h"
    3537#import "FileSystem.h"
    … …  
    485487
    486488} // namespace WebCore
     489
     490#endif // !USE(CFNETWORK)

  • trunk/WebCore/platform/network/mac/ResourceError.h

    r35900 r74943  
    2626#ifndef ResourceError_h
    2727#define ResourceError_h
     28
     29#if !USE(CFNETWORK)
    2830
    2931#include "ResourceErrorBase.h"
    … …  
    7274} // namespace WebCore
    7375
     76#endif // !USE(CFNETWORK)
     77
    7478#endif // ResourceError_h_

  • trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

    r74084 r74943  
    2727#import "ResourceHandleInternal.h"
    2828
     29#if !USE(CFNETWORK)
     30
    2931#import "AuthenticationChallenge.h"
    3032#import "AuthenticationMac.h"
    … …  
    10751077}
    10761078
    1077 #endif
     1079#endif // BUILDING_ON_TIGER
     1080
     1081#endif // !USE(CFNETWORK)

  • trunk/WebCore/platform/network/mac/ResourceRequest.h

    r68762 r74943  
    2727#ifndef ResourceRequest_h
    2828#define ResourceRequest_h
     29
     30#if !USE(CFNETWORK)
    2931
    3032#include "ResourceRequestBase.h"
    … …  
    8688} // namespace WebCore
    8789
     90#endif // !USE(CFNETWORK)
     91
    8892#endif // ResourceRequest_h

  • trunk/WebCore/platform/network/mac/ResourceRequestMac.mm

    r50226 r74943  
    2626#import "config.h"
    2727#import "ResourceRequest.h"
     28
     29#if !USE(CFNETWORK)
     30
    2831#import "WebCoreSystemInterface.h"
    2932
    … …  
    159162}
    160163
    161 }
     164} // namespace WebCore
     165
     166#endif // !USE(CFNETWORK)

  • trunk/WebCore/platform/network/mac/ResourceResponse.h

    r68762 r74943  
    2626#ifndef ResourceResponse_h
    2727#define ResourceResponse_h
     28
     29#if !USE(CFNETWORK)
    2830
    2931#include "ResourceResponseBase.h"
    … …  
    9193} // namespace WebCore
    9294
     95#endif // !USE(CFNETWORK)
     96
    9397#endif // ResourceResponse_h

  • trunk/WebCore/platform/network/mac/ResourceResponseMac.mm

    r73868 r74943  
    2626#import "config.h"
    2727#import "ResourceResponse.h"
     28
     29#if !USE(CFNETWORK)
    2830
    2931#import "HTTPParsers.h"
    … …  
    107109}
    108110
    109 }
     111} // namespace WebCore
     112
     113#endif // !USE(CFNETWORK)
Note: See TracChangeset for help on using the changeset viewer.