Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e

2 files changed, 49 insertions, 1 deletions

diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
index 936b6b3..c762d5b 100644
--- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
+++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
@@ -48,6 +48,9 @@ enum CFType {
     CFNumber,
     CFString,
     CFURL,
+#if PLATFORM(MAC)
+    SecCertificate,
+#endif
     Null,
     Unknown,
 };
@@ -76,6 +79,10 @@ static CFType typeFromCFTypeRef(CFTypeRef type)
         return CFString;
     if (typeID == CFURLGetTypeID())
         return CFURL;
+#if PLATFORM(MAC)
+    if (typeID == SecCertificateGetTypeID())
+        return SecCertificate;
+#endif
 
     ASSERT_NOT_REACHED();
     return Unknown;
@@ -110,6 +117,11 @@ static void encode(ArgumentEncoder* encoder, CFTypeRef typeRef)
     case CFURL:
         encode(encoder, static_cast<CFURLRef>(typeRef));
         return;
+#if PLATFORM(MAC)
+    case SecCertificate:
+        encode(encoder, (SecCertificateRef)typeRef);
+        return;
+#endif
     case Null:
         return;
     case Unknown:
@@ -178,6 +190,15 @@ static bool decode(ArgumentDecoder* decoder, RetainPtr<CFTypeRef>& result)
         result.adoptCF(url.leakRef());
         return true;
     }
+#if PLATFORM(MAC)
+    case SecCertificate: {
+        RetainPtr<SecCertificateRef> certificate;
+        if (!decode(decoder, certificate))
+            return false;
+        result.adoptCF(certificate.leakRef());
+        return true;
+    }
+#endif
     case Null:
         result = tokenNullTypeRef();
         return true;
@@ -459,5 +480,22 @@ bool decode(ArgumentDecoder* decoder, RetainPtr<CFURLRef>& result)
     return true;
 }
 
-} // namespace CoreIPC
+#if PLATFORM(MAC)
+void encode(ArgumentEncoder* encoder, SecCertificateRef certificate)
+{
+    RetainPtr<CFDataRef> data(AdoptCF, SecCertificateCopyData(certificate));
+    encode(encoder, data.get());
+}
 
+bool decode(ArgumentDecoder* decoder, RetainPtr<SecCertificateRef>& result)
+{
+    RetainPtr<CFDataRef> data;
+    if (!decode(decoder, data))
+        return false;
+
+    result.adoptCF(SecCertificateCreateWithData(0, data.get()));
+    return true;
+}
+#endif
+
+} // namespace CoreIPC
diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.h b/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
index 4caec5f..291a093 100644
--- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
+++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.h
@@ -28,6 +28,10 @@
 
 #include <wtf/RetainPtr.h>
 
+#if PLATFORM(MAC)
+#include <Security/SecCertificate.h>
+#endif
+
 namespace CoreIPC {
 
 class ArgumentEncoder;
@@ -61,6 +65,12 @@ bool decode(ArgumentDecoder*, RetainPtr<CFStringRef>& result);
 void encode(ArgumentEncoder*, CFURLRef);
 bool decode(ArgumentDecoder*, RetainPtr<CFURLRef>& result);
 
+#if PLATFORM(MAC)
+// SecCertificateRef
+void encode(ArgumentEncoder*, SecCertificateRef);
+bool decode(ArgumentDecoder*, RetainPtr<SecCertificateRef>& result);
+#endif
+
 CFTypeRef tokenNullTypeRef();
 
 } // namespace CoreIPC