Diff
Modified: trunk/Source/WTF/ChangeLog (117114 => 117115)
--- trunk/Source/WTF/ChangeLog 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WTF/ChangeLog 2012-05-15 19:23:05 UTC (rev 117115)
@@ -1,3 +1,12 @@
+2012-05-15 Andy Estes <[email protected]>
+
+ Add WTF_USE_SECURITY_FRAMEWORK and use it in place of the less specific PLATFORM(MAC)
+ https://bugs.webkit.org/show_bug.cgi?id=86508
+
+ Reviewed by Sam Weinig.
+
+ * wtf/Platform.h:
+
2012-05-15 Zoltan Herczeg <[email protected]>
NEONizing forceValidPreMultipliedPixels
Modified: trunk/Source/WTF/wtf/Platform.h (117114 => 117115)
--- trunk/Source/WTF/wtf/Platform.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WTF/wtf/Platform.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -558,6 +558,7 @@
#define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1
#endif
#define WTF_USE_APPKIT 1
+#define WTF_USE_SECURITY_FRAMEWORK 1
#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
#if PLATFORM(CHROMIUM) && OS(DARWIN)
@@ -610,6 +611,7 @@
#endif
#define WTF_USE_APPKIT 0
+#define WTF_USE_SECURITY_FRAMEWORK 0
#endif
#if PLATFORM(WIN) && !OS(WINCE)
Modified: trunk/Source/WebKit2/ChangeLog (117114 => 117115)
--- trunk/Source/WebKit2/ChangeLog 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-15 19:23:05 UTC (rev 117115)
@@ -1,3 +1,28 @@
+2012-05-15 Andy Estes <[email protected]>
+
+ Add WTF_USE_SECURITY_FRAMEWORK and use it in place of the less specific PLATFORM(MAC)
+ https://bugs.webkit.org/show_bug.cgi?id=86508
+
+ Reviewed by Sam Weinig.
+
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (CoreIPC::typeFromCFTypeRef):
+ (CoreIPC::encode):
+ (CoreIPC::decode):
+ (CoreIPC):
+ * Shared/cf/ArgumentCodersCF.h:
+ (CoreIPC):
+ * Shared/mac/KeychainAttribute.cpp:
+ * Shared/mac/KeychainAttribute.h:
+ * Shared/mac/SecKeychainItemRequestData.cpp:
+ * Shared/mac/SecKeychainItemRequestData.h:
+ * Shared/mac/SecKeychainItemResponseData.cpp:
+ * Shared/mac/SecKeychainItemResponseData.h:
+ * UIProcess/WebProcessProxy.h:
+ (WebKit):
+ (WebProcessProxy):
+ * WebProcess/mac/WebProcessMac.mm:
+
2012-05-15 Andreas Kling <[email protected]>
Deep copy PluginModuleInfo before passing across thread boundary.
Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (117114 => 117115)
--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2012-05-15 19:23:05 UTC (rev 117115)
@@ -53,7 +53,7 @@
CFNumber,
CFString,
CFURL,
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
SecCertificate,
SecKeychainItem,
#endif
@@ -87,7 +87,7 @@
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 @@
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 @@
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 @@
return true;
}
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
void encode(ArgumentEncoder* encoder, SecCertificateRef certificate)
{
RetainPtr<CFDataRef> data(AdoptCF, SecCertificateCopyData(certificate));
Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h (117114 => 117115)
--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -28,7 +28,7 @@
#include <wtf/RetainPtr.h>
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
#include <Security/SecCertificate.h>
#include <Security/SecKeychainItem.h>
#endif
@@ -74,7 +74,7 @@
void encode(ArgumentEncoder*, CFURLRef);
bool decode(ArgumentDecoder*, RetainPtr<CFURLRef>& result);
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
// SecCertificateRef
void encode(ArgumentEncoder*, SecCertificateRef);
bool decode(ArgumentDecoder*, RetainPtr<SecCertificateRef>& result);
Modified: trunk/Source/WebKit2/Shared/mac/KeychainAttribute.cpp (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/KeychainAttribute.cpp 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/KeychainAttribute.cpp 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#include "config.h"
#include "KeychainAttribute.h"
+#if USE(SECURITY_FRAMEWORK)
+
#include "ArgumentCoders.h"
#include "ArgumentCodersCF.h"
@@ -76,3 +78,5 @@
}
} // namespace CoreIPC
+
+#endif // USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/Shared/mac/KeychainAttribute.h (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/KeychainAttribute.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/KeychainAttribute.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#ifndef KeychainAttribute_h
#define KeychainAttribute_h
+#if USE(SECURITY_FRAMEWORK)
+
#include <wtf/RetainPtr.h>
#include <Security/Security.h>
@@ -50,4 +52,6 @@
} // namespace CoreIPC
+#endif // USE(SECURITY_FRAMEWORK)
+
#endif // KeychainAttribute_h
Modified: trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.cpp (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.cpp 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.cpp 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#include "config.h"
#include "SecKeychainItemRequestData.h"
+#if USE(SECURITY_FRAMEWORK)
+
#include "ArgumentCoders.h"
#include "ArgumentCodersCF.h"
@@ -176,3 +178,5 @@
}
} // namespace WebKit
+
+#endif // USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.h (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/SecKeychainItemRequestData.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#ifndef SecKeychainItemRequestData_h
#define SecKeychainItemRequestData_h
+#if USE(SECURITY_FRAMEWORK)
+
#include "DataReference.h"
#include "KeychainAttribute.h"
#include <Security/Security.h>
@@ -87,4 +89,6 @@
} // namespace WebKit
+#endif // USE(SECURITY_FRAMEWORK)
+
#endif // SecKeychainItemRequestData_h
Modified: trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.cpp 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#include "config.h"
#include "SecKeychainItemResponseData.h"
+#if USE(SECURITY_FRAMEWORK)
+
#include "ArgumentCoders.h"
#include "ArgumentCodersCF.h"
@@ -120,3 +122,5 @@
}
} // namespace WebKit
+
+#endif // USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.h (117114 => 117115)
--- trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/Shared/mac/SecKeychainItemResponseData.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -26,6 +26,8 @@
#ifndef SecKeychainItemResponseData_h
#define SecKeychainItemResponseData_h
+#if USE(SECURITY_FRAMEWORK)
+
#include "KeychainAttribute.h"
#include <Security/Security.h>
#include <wtf/RetainPtr.h>
@@ -64,4 +66,6 @@
} // namespace WebKit
+#endif // USE(SECURITY_FRAMEWORK)
+
#endif // SecKeychainItemResponseData_h
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (117114 => 117115)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-05-15 19:23:05 UTC (rev 117115)
@@ -47,7 +47,7 @@
namespace WebKit {
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
class SecItemRequestData;
class SecItemResponseData;
#endif
@@ -138,7 +138,7 @@
void getPluginProcessConnection(const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
void pluginSyncMessageSendTimedOut(const String& pluginPath);
#endif
-#if PLATFORM(MAC)
+#if USE(SECURITY_FRAMEWORK)
void secItemRequest(CoreIPC::Connection*, uint64_t requestID, const SecItemRequestData&);
void secKeychainItemRequest(CoreIPC::Connection*, uint64_t requestID, const SecKeychainItemRequestData&);
#endif
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (117114 => 117115)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2012-05-15 19:22:08 UTC (rev 117114)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2012-05-15 19:23:05 UTC (rev 117115)
@@ -45,11 +45,13 @@
#import <objc/runtime.h>
#import <stdio.h>
+#if USE(SECURITY_FRAMEWORK)
#if defined(BUILDING_ON_SNOW_LEOPARD)
#import "KeychainItemShimMethods.h"
#else
#import "SecItemShimMethods.h"
#endif
+#endif
#if ENABLE(WEB_PROCESS_SANDBOX)
#import <stdlib.h>
