diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
| commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
| tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp | |
| parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
| download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz | |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp index 6a2fee1c7..35580c5ce 100644 --- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp +++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp @@ -53,7 +53,7 @@ enum CFType { CFNumber, CFString, CFURL, -#if PLATFORM(MAC) +#if USE(SECURITY_FRAMEWORK) SecCertificate, SecKeychainItem, #endif @@ -87,7 +87,7 @@ static CFType typeFromCFTypeRef(CFTypeRef type) return CFString; if (typeID == CFURLGetTypeID()) return CFURL; -#if PLATFORM(MAC) +#if USE(SECURITY_FRAMEWORK) if (typeID == SecCertificateGetTypeID()) return SecCertificate; if (typeID == SecKeychainItemGetTypeID()) @@ -130,7 +130,7 @@ void encode(ArgumentEncoder* encoder, CFTypeRef typeRef) case CFURL: encode(encoder, static_cast<CFURLRef>(typeRef)); return; -#if PLATFORM(MAC) +#if USE(SECURITY_FRAMEWORK) case SecCertificate: encode(encoder, (SecCertificateRef)typeRef); return; @@ -213,7 +213,7 @@ bool decode(ArgumentDecoder* decoder, RetainPtr<CFTypeRef>& result) result.adoptCF(url.leakRef()); return true; } -#if PLATFORM(MAC) +#if USE(SECURITY_FRAMEWORK) case SecCertificate: { RetainPtr<SecCertificateRef> certificate; if (!decode(decoder, certificate)) @@ -535,7 +535,7 @@ bool decode(ArgumentDecoder* decoder, RetainPtr<CFURLRef>& result) return true; } -#if PLATFORM(MAC) +#if USE(SECURITY_FRAMEWORK) void encode(ArgumentEncoder* encoder, SecCertificateRef certificate) { RetainPtr<CFDataRef> data(AdoptCF, SecCertificateCopyData(certificate)); |