Changeset 91084 in webkit


Ignore:
Timestamp:
Jul 15, 2011 11:52:51 AM (13 years ago)
Author:
psolanki@apple.com
Message:

Part of ​https://bugs.webkit.org/show_bug.cgi?id=63674
Get webkit to compile with USE(CFNETWORK) enabled on Mac

Reviewed by David Kilzer.

No new tests because no change in functionality and option is not enabled on Mac.

  • platform/network/cf/AuthenticationCF.h: Just use AuthenticationMac.h instead of having

Mac-specific declarations here.

  • platform/network/cf/CredentialStorageCFNet.cpp:
  • platform/network/mac/AuthenticationMac.h:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r91081 r91084  
     12011-07-15  Pratik Solanki  <psolanki@apple.com>
     2
     3        Part of https://bugs.webkit.org/show_bug.cgi?id=63674
     4        Get webkit to compile with USE(CFNETWORK) enabled on Mac
     5
     6        Reviewed by David Kilzer.
     7
     8        No new tests because no change in functionality and option is not enabled on Mac.
     9
     10        * platform/network/cf/AuthenticationCF.h: Just use AuthenticationMac.h instead of having
     11        Mac-specific declarations here.
     12        * platform/network/cf/CredentialStorageCFNet.cpp:
     13        * platform/network/mac/AuthenticationMac.h:
     14
    1152011-07-15  Pratik Solanki  <psolanki@apple.com>
    216

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

    r86414 r91084  
    2929#if USE(CFNETWORK)
    3030
    31 #ifdef __OBJC__
    32 @class NSURLAuthenticationChallenge;
    33 @class NSURLCredential;
    34 @class NSURLProtectionSpace;
    35 #else
    36 class NSURLAuthenticationChallenge;
    37 class NSURLCredential;
    38 class NSURLProtectionSpace;
    39 #endif
    40 
    4131#include <CFNetwork/CFURLCredentialPriv.h>
    4232
    … …  
    6050ProtectionSpace core(CFURLProtectionSpaceRef);
    6151
    62 #if PLATFORM(MAC)
    63 AuthenticationChallenge core(NSURLAuthenticationChallenge *);
    64 Credential core(NSURLCredential *);
    65 ProtectionSpace core(NSURLProtectionSpace*);
    66 
    67 NSURLAuthenticationChallenge *mac(const AuthenticationChallenge&);
    68 NSURLCredential *mac(const Credential&);
    69 NSURLProtectionSpace *mac(const ProtectionSpace&);
    70 #endif
    71 
    7252}
    7353

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

    r74943 r91084  
    3232#include "Credential.h"
    3333#include "ProtectionSpace.h"
     34#include <wtf/RetainPtr.h>
     35
     36#if PLATFORM(MAC)
     37#include "WebCoreSystemInterface.h"
     38#elif PLATFORM(WIN)
    3439#include <WebKitSystemInterface/WebKitSystemInterface.h>
    35 #include <wtf/RetainPtr.h>
     40#endif
    3641
    3742namespace WebCore {

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

    r74943 r91084  
    2626#define AuthenticationMac_h
    2727
    28 #if !USE(CFNETWORK)
    29 
    3028#ifdef __OBJC__
    3129
    … …  
    5149#endif // __OBJC__
    5250
    53 #endif // !USE(CFNETWORK)
    54 
    5551#endif // AuthenticationMac_h
Note: See TracChangeset for help on using the changeset viewer.