Attachment 217578 Details for Bug 124720 – proposed patch

[patch] proposed patch

1.patch (text/plain), 65.62 KB, created by Csaba Osztrogonác on 2013-11-21 10:01:58 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-11-21 10:01:58 PST

Size: 65.62 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8be01fb..5623590 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2013-11-21  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        Move CertificateInfo to WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=124720
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * GNUmakefile.list.am:
>+        * PlatformEfl.cmake:
>+        * PlatformGTK.cmake:
>+        * WebCore.exp.in:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * platform/network/mac/CertificateInfo.h: Renamed from Source/WebKit2/Shared/mac/CertificateInfo.h.
>+        (WebCore::CertificateInfo::setCertificateChain):
>+        (WebCore::CertificateInfo::certificateChain):
>+        * platform/network/mac/CertificateInfoMac.mm: Renamed from Source/WebKit2/Shared/mac/CertificateInfo.mm.
>+        (WebCore::CertificateInfo::CertificateInfo):
>+        (WebCore::CertificateInfo::dump):
>+
> 2013-11-21  Mihai Maerean  <mmaerean@adobe.com>
> 
>         Fix hover area for divs with css transforms
>diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
>index 71ddd66..bc29be4 100644
>--- a/Source/WebCore/GNUmakefile.list.am
>+++ b/Source/WebCore/GNUmakefile.list.am
>@@ -5473,6 +5473,7 @@ webcore_platform_sources += \
> 	Source/WebCore/platform/network/BlobRegistryImpl.h \
> 	Source/WebCore/platform/network/BlobResourceHandle.cpp \
> 	Source/WebCore/platform/network/BlobResourceHandle.h \
>+	Source/WebCore/platform/network/soup/CertificateInfo.h \
> 	Source/WebCore/platform/network/BlobStorageData.h \
> 	Source/WebCore/platform/network/CookieStorage.h \
> 	Source/WebCore/platform/network/FormDataBuilder.cpp \
>@@ -5508,6 +5509,7 @@ webcore_platform_sources += \
> 	Source/WebCore/platform/network/SocketStreamHandleClient.h \
> 	Source/WebCore/platform/network/soup/AuthenticationChallenge.h \
> 	Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \
>+	Source/WebCore/platform/network/soup/CertificateInfo.cpp \
> 	Source/WebCore/platform/network/soup/CookieJarSoup.cpp \
> 	Source/WebCore/platform/network/soup/CookieJarSoup.h \
> 	Source/WebCore/platform/network/soup/CookieStorageSoup.cpp \
>diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
>index 12d8e0b..11424fd 100644
>--- a/Source/WebCore/PlatformEfl.cmake
>+++ b/Source/WebCore/PlatformEfl.cmake
>@@ -153,6 +153,7 @@ list(APPEND WebCore_SOURCES
>     platform/network/efl/NetworkStateNotifierEfl.cpp
> 
>     platform/network/soup/AuthenticationChallengeSoup.cpp
>+    platform/network/soup/CertificateInfo.cpp
>     platform/network/soup/CookieJarSoup.cpp
>     platform/network/soup/CookieStorageSoup.cpp
>     platform/network/soup/CredentialStorageSoup.cpp
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index 197e1d6..2a4b525 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -188,6 +188,7 @@ list(APPEND WebCore_SOURCES
>     platform/network/gtk/CredentialBackingStore.cpp
> 
>     platform/network/soup/AuthenticationChallengeSoup.cpp
>+    platform/network/soup/CertificateInfo.cpp
>     platform/network/soup/CookieJarSoup.cpp
>     platform/network/soup/CookieStorageSoup.cpp
>     platform/network/soup/CredentialStorageSoup.cpp
>diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
>index 0eaa0e6..88c00b7 100644
>--- a/Source/WebCore/WebCore.exp.in
>+++ b/Source/WebCore/WebCore.exp.in
>@@ -67,6 +67,9 @@ __ZN3WTF10StringImplcvP8NSStringEv
> __ZN3WTF12AtomicString3addEPK10__CFString
> __ZN3WTF6StringC1EP8NSString
> __ZN3WTF6StringC1EPK10__CFString
>+__ZN7WebCore15CertificateInfoC1ERKNS_16ResourceResponseE
>+__ZN7WebCore15CertificateInfoC1EPK9__CFArray
>+__ZN7WebCore15CertificateInfoC1Ev
> __ZN7WebCore10ClientRectC1ERKNS_7IntRectE
> __ZN7WebCore10ClientRectC1ERKNS_9FloatRectE
> __ZN7WebCore10ClientRectC1Ev
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index d55b7c2..a863374 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -1941,7 +1941,10 @@
> 		5DF7F5C20F01F92A00526B4B /* CSSPropertyNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */; };
> 		5DFE8F560D16477B0076E937 /* ScheduledAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */; };
> 		5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; };
>+		5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */; };
>+		5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F2DBBE8178E336900141486 /* CertificateInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */; };
>+		5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FE1D291178FD1F3001AA3C3 /* Security.framework */; };
> 		626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */; };
> 		626CDE0F1140424C001E5A68 /* SpatialNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		628D214C12131ED10055DCFC /* NetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 628D214B12131ED10055DCFC /* NetworkingContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -8669,7 +8672,10 @@
> 		5DA97ECC168E787B000E3676 /* SystemVersionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemVersionMac.mm; sourceTree = "<group>"; };
> 		5DB1BC6810715A6400EFAA49 /* TransformSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformSource.h; sourceTree = "<group>"; };
> 		5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformSourceLibxslt.cpp; sourceTree = "<group>"; };
>+		5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CertificateInfoMac.mm; sourceTree = "<group>"; };
>+		5F2DBBE8178E336900141486 /* CertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertificateInfo.h; sourceTree = "<group>"; };
> 		5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSEventTarget.h; sourceTree = "<group>"; };
>+		5FE1D291178FD1F3001AA3C3 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../../../../../System/Library/Frameworks/Security.framework; sourceTree = "<group>"; };
> 		626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpatialNavigation.cpp; sourceTree = "<group>"; };
> 		626CDE0D1140424C001E5A68 /* SpatialNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpatialNavigation.h; sourceTree = "<group>"; };
> 		628D214B12131ED10055DCFC /* NetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkingContext.h; sourceTree = "<group>"; };
>@@ -13519,6 +13525,7 @@
> 			isa = PBXFrameworksBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>+				5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */,
> 				FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */,
> 				93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */,
> 				FD2DBF1312B048A300ED98C6 /* AudioToolbox.framework in Frameworks */,
>@@ -13865,6 +13872,7 @@
> 		0867D691FE84028FC02AAC07 /* WebKit */ = {
> 			isa = PBXGroup;
> 			children = (
>+				5FE1D291178FD1F3001AA3C3 /* Security.framework */,
> 				65C97AF208EA908800ACD273 /* config.h */,
> 				EDEC98020AED7E170059137F /* WebCorePrefix.h */,
> 				9307061309E0CA8200B17FE4 /* DerivedSources.make */,
>@@ -15422,6 +15430,8 @@
> 			children = (
> 				514C76420CE9234E007EF3CD /* AuthenticationMac.h */,
> 				514C76430CE9234E007EF3CD /* AuthenticationMac.mm */,
>+				5F2DBBE8178E336900141486 /* CertificateInfo.h */,
>+				5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */,
> 				E1424C8F164B460B00F32D40 /* CookieJarMac.mm */,
> 				E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */,
> 				E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */,
>@@ -24121,6 +24131,7 @@
> 				0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */,
> 				499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
> 				493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
>+				5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
> 				07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */,
> 				E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */,
> 				BC5C762B1497FE1400BC4775 /* PlatformEvent.h in Headers */,
>@@ -28298,6 +28309,7 @@
> 				977E2E0E12F0FC9C00C13380 /* XSSAuditorDelegate.cpp in Sources */,
> 				E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */,
> 				FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
>+				5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */,
> 				FD1762DF176686D900D836A8 /* UpSampler.cpp in Sources */,
> 				FD1762E3176686EA00D836A8 /* DownSampler.cpp in Sources */,
> 				6E84E9E017668BEE00815B68 /* RasterShape.cpp in Sources */,
>diff --git a/Source/WebCore/platform/network/mac/CertificateInfo.h b/Source/WebCore/platform/network/mac/CertificateInfo.h
>new file mode 100644
>index 0000000..c8b3cda
>--- /dev/null
>+++ b/Source/WebCore/platform/network/mac/CertificateInfo.h
>@@ -0,0 +1,53 @@
>+/*
>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef CertificateInfo_h
>+#define CertificateInfo_h
>+
>+#include <WebCore/ResourceResponse.h>
>+#include <wtf/RetainPtr.h>
>+
>+namespace WebCore {
>+
>+class CertificateInfo {
>+public:
>+    CertificateInfo();
>+    explicit CertificateInfo(const ResourceResponse&);
>+    explicit CertificateInfo(CFArrayRef certificateChain);
>+
>+    void setCertificateChain(CFArrayRef certificateChain) { m_certificateChain = certificateChain; }
>+    CFArrayRef certificateChain() const { return m_certificateChain.get(); }
>+
>+#ifndef NDEBUG
>+    void dump() const;
>+#endif
>+
>+private:
>+    RetainPtr<CFArrayRef> m_certificateChain;
>+};
>+
>+} // namespace WebKit
>+
>+#endif // CertificateInfo_h
>diff --git a/Source/WebCore/platform/network/mac/CertificateInfoMac.mm b/Source/WebCore/platform/network/mac/CertificateInfoMac.mm
>new file mode 100644
>index 0000000..203c9cc
>--- /dev/null
>+++ b/Source/WebCore/platform/network/mac/CertificateInfoMac.mm
>@@ -0,0 +1,59 @@
>+/*
>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#import "config.h"
>+#import "CertificateInfo.h"
>+
>+namespace WebCore {
>+
>+CertificateInfo::CertificateInfo()
>+{
>+}
>+
>+CertificateInfo::CertificateInfo(const ResourceResponse& response)
>+    : m_certificateChain(response.certificateChain())
>+{
>+}
>+
>+CertificateInfo::CertificateInfo(CFArrayRef certificateChain)
>+    : m_certificateChain(certificateChain)
>+{
>+}
>+
>+#ifndef NDEBUG
>+void CertificateInfo::dump() const
>+{
>+    unsigned entries = m_certificateChain ? CFArrayGetCount(m_certificateChain.get()) : 0;
>+
>+    NSLog(@"CertificateInfo\n");
>+    NSLog(@"  Entries: %d\n", entries);
>+    for (unsigned i = 0; i < entries; ++i) {
>+        RetainPtr<CFStringRef> summary = adoptCF(SecCertificateCopySubjectSummary((SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i)));
>+        NSLog(@"  %@", (NSString *)summary.get());
>+    }
>+}
>+#endif
>+
>+} // namespace WebCore
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index f389f1e..7affe06 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,63 @@
> 2013-11-21  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
> 
>+        Move CertificateInfo to WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=124720
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * GNUmakefile.list.am:
>+        * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcess.messages.in:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        * NetworkProcess/mac/NetworkProcessMac.mm:
>+        * PlatformEfl.cmake:
>+        * PlatformGTK.cmake:
>+        * Shared/API/c/mac/WKCertificateInfoMac.mm:
>+        * Shared/Authentication/AuthenticationManager.h:
>+        * Shared/Authentication/AuthenticationManager.messages.in:
>+        * Shared/Authentication/mac/AuthenticationManager.mac.mm:
>+        * Shared/UserMessageCoders.h:
>+        (WebKit::UserMessageDecoder::baseDecode):
>+        * Shared/WebCertificateInfo.h:
>+        (WebKit::WebCertificateInfo::create):
>+        (WebKit::WebCertificateInfo::certificateInfo):
>+        (WebKit::WebCertificateInfo::WebCertificateInfo):
>+        * Shared/WebCoreArgumentCoders.cpp:
>+        (CoreIPC::::encode):
>+        (CoreIPC::::decode):
>+        * Shared/WebCoreArgumentCoders.h:
>+        * Shared/mac/WebCoreArgumentCodersMac.mm:
>+        (CoreIPC::::encodePlatformData):
>+        (CoreIPC::::decodePlatformData):
>+        * Shared/soup/CertificateInfo.cpp: Removed.
>+        * Shared/soup/CertificateInfo.h: Removed.
>+        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
>+        (CoreIPC::::encodePlatformData):
>+        (CoreIPC::::decodePlatformData):
>+        * UIProcess/API/gtk/WebKitWebView.cpp:
>+        (webkit_web_view_get_tls_info):
>+        * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
>+        (WebKit::AuthenticationChallengeProxy::useCredential):
>+        * UIProcess/WebFrameProxy.cpp:
>+        (WebKit::WebFrameProxy::didCommitLoad):
>+        * UIProcess/WebFrameProxy.h:
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::didCommitLoadForFrame):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * WebKit2.xcodeproj/project.pbxproj:
>+        * WebProcess/Network/WebResourceLoader.cpp:
>+        * WebProcess/Network/WebResourceLoader.h:
>+        * WebProcess/Network/WebResourceLoader.messages.in:
>+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
>+        * WebProcess/WebProcess.h:
>+        * WebProcess/WebProcess.messages.in:
>+        * WebProcess/soup/WebProcessSoup.cpp:
>+        (WebKit::WebProcess::allowSpecificHTTPSCertificateForHost):
>+
>+2013-11-21  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>         Rename PlatformCertificateInfo to CertificateInfo
>         https://bugs.webkit.org/show_bug.cgi?id=124150
> 
>diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am
>index 9d1585e..e12ff29 100644
>--- a/Source/WebKit2/GNUmakefile.list.am
>+++ b/Source/WebKit2/GNUmakefile.list.am
>@@ -481,8 +481,6 @@ webkit2_sources += \
> 	Source/WebKit2/Shared/SessionState.h \
> 	Source/WebKit2/Shared/StatisticsData.cpp \
> 	Source/WebKit2/Shared/StatisticsData.h \
>-	Source/WebKit2/Shared/soup/CertificateInfo.cpp \
>-	Source/WebKit2/Shared/soup/CertificateInfo.h \
> 	Source/WebKit2/Shared/soup/SoupCookiePersistentStorageType.h \
> 	Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
> 	Source/WebKit2/Shared/TextCheckerState.h \
>@@ -1365,8 +1363,6 @@ webkit2_plugin_process_sources += \
> 	Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp \
> 	Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
> 	Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \
>-	Source/WebKit2/Shared/soup/CertificateInfo.cpp \
>-	Source/WebKit2/Shared/soup/CertificateInfo.h \
> 	Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
> 	Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
> 	Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
>diff --git a/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp b/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
>index 865b4c0..e509ee8 100644
>--- a/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
>+++ b/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
>@@ -26,11 +26,11 @@
> #include "config.h"
> #include "AsynchronousNetworkLoaderClient.h"
> 
>-#include "CertificateInfo.h"
> #include "DataReference.h"
> #include "NetworkResourceLoader.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebResourceLoaderMessages.h"
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/ResourceError.h>
> #include <WebCore/SharedBuffer.h>
> #include <wtf/CurrentTime.h>
>diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.h b/Source/WebKit2/NetworkProcess/NetworkProcess.h
>index 85b56f8..6a93d80 100644
>--- a/Source/WebKit2/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit2/NetworkProcess/NetworkProcess.h
>@@ -35,10 +35,12 @@
> #include "NetworkResourceLoadScheduler.h"
> #include <wtf/Forward.h>
> 
>-namespace WebKit {
>+namespace WebCore {
>+class CertificateInfo;
>+}
> 
>+namespace WebKit {
> class AuthenticationManager;
>-class CertificateInfo;
> class NetworkConnectionToWebProcess;
> class NetworkProcessSupplement;
> struct NetworkProcessCreationParameters;
>@@ -104,7 +106,7 @@ private:
>     void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&);
>     void cancelDownload(uint64_t downloadID);
>     void setCacheModel(uint32_t);
>-    void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
>+    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
>     void getNetworkProcessStatistics(uint64_t callbackID);
>     void clearCacheForAllOrigins(uint32_t cachesToClear);
> 
>diff --git a/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
>index f964a7f..32bce05 100644
>--- a/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
>+++ b/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
>@@ -39,7 +39,7 @@ messages -> NetworkProcess LegacyReceiver {
>     SetProcessSuppressionEnabled(bool flag)
> #endif
> 
>-    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, WTF::String host)
>+    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, WTF::String host)
>     
>     GetNetworkProcessStatistics(uint64_t callbackID)
>     
>diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>index 432ec76..2f8a49f 100644
>--- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
>@@ -30,7 +30,6 @@
> 
> #include "AsynchronousNetworkLoaderClient.h"
> #include "AuthenticationManager.h"
>-#include "CertificateInfo.h"
> #include "DataReference.h"
> #include "Logging.h"
> #include "NetworkBlobRegistry.h"
>diff --git a/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm b/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
>index 09646c8..961a419 100644
>--- a/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
>+++ b/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
>@@ -28,13 +28,13 @@
> 
> #if ENABLE(NETWORK_PROCESS)
> 
>-#import "CertificateInfo.h"
> #import "NetworkProcessCreationParameters.h"
> #import "NetworkResourceLoader.h"
> #import "ResourceCachesToClear.h"
> #import "SandboxExtension.h"
> #import "SandboxInitializationParameters.h"
> #import "StringUtilities.h"
>+#import <WebCore/CertificateInfo.h>
> #import <WebCore/FileSystem.h>
> #import <WebCore/LocalizedStrings.h>
> #import <WebKitSystemInterface.h>
>diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
>index 6d3e712..e726858 100644
>--- a/Source/WebKit2/PlatformEfl.cmake
>+++ b/Source/WebKit2/PlatformEfl.cmake
>@@ -49,7 +49,6 @@ list(APPEND WebKit2_SOURCES
>     Shared/linux/SeccompFilters/Syscall.cpp
>     Shared/linux/SeccompFilters/SyscallPolicy.cpp
> 
>-    Shared/soup/CertificateInfo.cpp
>     Shared/soup/WebCoreArgumentCodersSoup.cpp
> 
>     UIProcess/DefaultUndoController.cpp
>diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
>index 1b1c554..4d81766 100644
>--- a/Source/WebKit2/PlatformGTK.cmake
>+++ b/Source/WebKit2/PlatformGTK.cmake
>@@ -61,7 +61,6 @@ list(APPEND WebKit2_SOURCES
>     Shared/linux/SeccompFilters/Syscall.cpp
>     Shared/linux/SeccompFilters/SyscallPolicy.cpp
> 
>-    Shared/soup/CertificateInfo.cpp
>     Shared/soup/WebCoreArgumentCodersSoup.cpp
> 
>     UIProcess/DefaultUndoController.cpp
>diff --git a/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm b/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>index 32ec0f4..32fa21f 100644
>--- a/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>+++ b/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>@@ -29,6 +29,7 @@
> #import "WKAPICast.h"
> #import "WebCertificateInfo.h"
> 
>+using namespace WebCore;
> using namespace WebKit;
> 
> WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain)
>diff --git a/Source/WebKit2/Shared/Authentication/AuthenticationManager.h b/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
>index 4f65e9f..4975986 100644
>--- a/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
>+++ b/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
>@@ -34,13 +34,13 @@
> #include <wtf/HashMap.h>
> 
> namespace WebCore {
>-    class AuthenticationChallenge;
>-    class Credential;
>+class AuthenticationChallenge;
>+class CertificateInfo;
>+class Credential;
> }
> 
> namespace WebKit {
> 
>-class CertificateInfo;
> class ChildProcess;
> class Download;
> class WebFrame;
>@@ -59,7 +59,7 @@ public:
>     // Called for downloads with or without the NetworkProcess
>     void didReceiveAuthenticationChallenge(Download*, const WebCore::AuthenticationChallenge&);
> 
>-    void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const CertificateInfo&);
>+    void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
>     void continueWithoutCredentialForChallenge(uint64_t challengeID);
>     void cancelChallenge(uint64_t challengeID);
>     
>@@ -69,7 +69,7 @@ private:
>     // CoreIPC::MessageReceiver
>     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
> 
>-    bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&);
>+    bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&);
> 
>     uint64_t establishIdentifierForChallenge(const WebCore::AuthenticationChallenge&);
> 
>diff --git a/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in b/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in
>index da13f34..34db9b2 100644
>--- a/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in
>+++ b/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in
>@@ -21,7 +21,7 @@
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> messages -> AuthenticationManager {
>-    void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebKit::CertificateInfo certificate);
>+    void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebCore::CertificateInfo certificate);
>     void ContinueWithoutCredentialForChallenge(uint64_t challengeID);
>     void CancelChallenge(uint64_t challengeID);
> }
>diff --git a/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm b/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm
>index a8618cd..8b6d713 100644
>--- a/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm
>+++ b/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm
>@@ -28,9 +28,9 @@
> 
> #if USE(SECURITY_FRAMEWORK)
> 
>-#include "CertificateInfo.h"
> #include <Security/SecIdentity.h>
> #include <WebCore/AuthenticationChallenge.h>
>+#include <WebCore/CertificateInfo.h>
> 
> using namespace WebCore;
> 
>diff --git a/Source/WebKit2/Shared/UserMessageCoders.h b/Source/WebKit2/Shared/UserMessageCoders.h
>index baf975b..37d234a 100644
>--- a/Source/WebKit2/Shared/UserMessageCoders.h
>+++ b/Source/WebKit2/Shared/UserMessageCoders.h
>@@ -504,7 +504,7 @@ public:
>             break;
>         }
>         case API::Object::Type::CertificateInfo: {
>-            CertificateInfo certificateInfo;
>+            WebCore::CertificateInfo certificateInfo;
>             if (!decoder.decode(certificateInfo))
>                 return false;
>             coder.m_root = WebCertificateInfo::create(certificateInfo);
>diff --git a/Source/WebKit2/Shared/WebCertificateInfo.h b/Source/WebKit2/Shared/WebCertificateInfo.h
>index e901d30..fecb94b 100644
>--- a/Source/WebKit2/Shared/WebCertificateInfo.h
>+++ b/Source/WebKit2/Shared/WebCertificateInfo.h
>@@ -27,27 +27,27 @@
> #define WebCertificateInfo_h
> 
> #include "APIObject.h"
>-#include "CertificateInfo.h"
>+#include <WebCore/CertificateInfo.h>
> #include <wtf/PassRefPtr.h>
> 
> namespace WebKit {
> 
> class WebCertificateInfo : public API::TypedObject<API::Object::Type::CertificateInfo> {
> public:
>-    static PassRefPtr<WebCertificateInfo> create(const CertificateInfo& info)
>+    static PassRefPtr<WebCertificateInfo> create(const WebCore::CertificateInfo& info)
>     {
>         return adoptRef(new WebCertificateInfo(info));
>     }
> 
>-    const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
>+    const WebCore::CertificateInfo& certificateInfo() const { return m_certificateInfo; }
> 
> private:
>-    explicit WebCertificateInfo(const CertificateInfo& info)
>+    explicit WebCertificateInfo(const WebCore::CertificateInfo& info)
>         : m_certificateInfo(info)
>     {
>     }
> 
>-    CertificateInfo m_certificateInfo;
>+    WebCore::CertificateInfo m_certificateInfo;
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>index bc831fc..8360f7f 100644
>--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>@@ -28,6 +28,7 @@
> 
> #include "ShareableBitmap.h"
> #include <WebCore/AuthenticationChallenge.h>
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/Cookie.h>
> #include <WebCore/Credential.h>
> #include <WebCore/Cursor.h>
>@@ -85,6 +86,22 @@ bool ArgumentCoder<TransformationMatrix>::decode(ArgumentDecoder& decoder, Trans
>     return SimpleArgumentCoder<TransformationMatrix>::decode(decoder, transformationMatrix);
> }
> 
>+void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
>+{
>+    encodePlatformData(encoder, certificateInfo);
>+}
>+
>+bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
>+{
>+    CertificateInfo certificate;
>+
>+    if (!decodePlatformData(decoder, certificate))
>+        return false;
>+
>+    certificateInfo = certificate;
>+
>+    return true;
>+}
> 
> void ArgumentCoder<FloatPoint>::encode(ArgumentEncoder& encoder, const FloatPoint& floatPoint)
> {
>diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.h b/Source/WebKit2/Shared/WebCoreArgumentCoders.h
>index 6888139..289e7d4 100644
>--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.h
>+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.h
>@@ -31,6 +31,7 @@
> namespace WebCore {
> class AffineTransform;
> class AuthenticationChallenge;
>+class CertificateInfo;
> class Color;
> class Credential;
> class Cursor;
>@@ -93,6 +94,13 @@ template<> struct ArgumentCoder<WebCore::TransformationMatrix> {
>     static bool decode(ArgumentDecoder&, WebCore::TransformationMatrix&);
> };
> 
>+template<> struct ArgumentCoder<WebCore::CertificateInfo> {
>+    static void encode(ArgumentEncoder&, const WebCore::CertificateInfo&);
>+    static bool decode(ArgumentDecoder&, WebCore::CertificateInfo&);
>+    static void encodePlatformData(ArgumentEncoder&, const WebCore::CertificateInfo&);
>+    static bool decodePlatformData(ArgumentDecoder&, WebCore::CertificateInfo&);
>+};
>+
> template<> struct ArgumentCoder<WebCore::FloatPoint> {
>     static void encode(ArgumentEncoder&, const WebCore::FloatPoint&);
>     static bool decode(ArgumentDecoder&, WebCore::FloatPoint&);
>diff --git a/Source/WebKit2/Shared/mac/CertificateInfo.h b/Source/WebKit2/Shared/mac/CertificateInfo.h
>deleted file mode 100644
>index 4ddc751..0000000
>--- a/Source/WebKit2/Shared/mac/CertificateInfo.h
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-/*
>- * Copyright (C) 2010 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef CertificateInfo_h
>-#define CertificateInfo_h
>-
>-#include <WebCore/ResourceResponse.h>
>-#include <wtf/RetainPtr.h>
>-
>-namespace CoreIPC {
>-class ArgumentDecoder;
>-class ArgumentEncoder;
>-}
>-
>-namespace WebKit {
>-
>-class CertificateInfo {
>-public:
>-    CertificateInfo();
>-    explicit CertificateInfo(const WebCore::ResourceResponse&);
>-    explicit CertificateInfo(CFArrayRef certificateChain);
>-
>-    CFArrayRef certificateChain() const { return m_certificateChain.get(); }
>-
>-    void encode(CoreIPC::ArgumentEncoder&) const;
>-    static bool decode(CoreIPC::ArgumentDecoder&, CertificateInfo&);
>-
>-#ifndef NDEBUG
>-    void dump() const;
>-#endif
>-
>-private:
>-    RetainPtr<CFArrayRef> m_certificateChain;
>-};
>-
>-} // namespace WebKit
>-
>-#endif // CertificateInfo_h
>diff --git a/Source/WebKit2/Shared/mac/CertificateInfo.mm b/Source/WebKit2/Shared/mac/CertificateInfo.mm
>deleted file mode 100644
>index 260eab6..0000000
>--- a/Source/WebKit2/Shared/mac/CertificateInfo.mm
>+++ /dev/null
>@@ -1,91 +0,0 @@
>-/*
>- * Copyright (C) 2010 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#import "config.h"
>-#import "CertificateInfo.h"
>-
>-#import "ArgumentCodersCF.h"
>-#import "ArgumentDecoder.h"
>-#import "ArgumentEncoder.h"
>-
>-using namespace WebCore;
>-
>-namespace WebKit {
>-
>-CertificateInfo::CertificateInfo()
>-{
>-}
>-
>-CertificateInfo::CertificateInfo(const ResourceResponse& response)
>-    : m_certificateChain(response.certificateChain())
>-{
>-}
>-
>-CertificateInfo::CertificateInfo(CFArrayRef certificateChain)
>-    : m_certificateChain(certificateChain)
>-{
>-}
>-
>-void CertificateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
>-{
>-    if (!m_certificateChain) {
>-        encoder << false;
>-        return;
>-    }
>-
>-    encoder << true;
>-    CoreIPC::encode(encoder, m_certificateChain.get());
>-}
>-
>-bool CertificateInfo::decode(CoreIPC::ArgumentDecoder& decoder, CertificateInfo& c)
>-{
>-    bool hasCertificateChain;
>-    if (!decoder.decode(hasCertificateChain))
>-        return false;
>-
>-    if (!hasCertificateChain)
>-        return true;
>-
>-    if (!CoreIPC::decode(decoder, c.m_certificateChain))
>-        return false;
>-
>-    return true;
>-}
>-
>-#ifndef NDEBUG
>-void CertificateInfo::dump() const
>-{
>-    unsigned entries = m_certificateChain ? CFArrayGetCount(m_certificateChain.get()) : 0;
>-
>-    NSLog(@"CertificateInfo\n");
>-    NSLog(@"  Entries: %d\n", entries);
>-    for (unsigned i = 0; i < entries; ++i) {
>-        RetainPtr<CFStringRef> summary = adoptCF(SecCertificateCopySubjectSummary((SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i)));
>-        NSLog(@"  %@", (NSString *)summary.get());
>-    }
>-}
>-#endif
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm b/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
>index ce9c06d..e6e9238 100644
>--- a/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
>+++ b/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
>@@ -1,5 +1,6 @@
> /*
>  * Copyright (C) 2010 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013 Company 100 Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -28,14 +29,13 @@
> 
> #import "ArgumentCodersCF.h"
> #import "DataReference.h"
>-#import "CertificateInfo.h"
> #import "WebKitSystemInterface.h"
>+#import <WebCore/CertificateInfo.h>
> #import <WebCore/KeyboardEvent.h>
> #import <WebCore/ResourceError.h>
> #import <WebCore/ResourceRequest.h>
> 
> using namespace WebCore;
>-using namespace WebKit;
> 
> namespace CoreIPC {
> 
>@@ -134,6 +134,36 @@ bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder& decode
>     return true;
> }
> 
>+void ArgumentCoder<CertificateInfo>::encodePlatformData(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
>+{
>+    CFArrayRef certificateChain = certificateInfo.certificateChain();
>+    if (!certificateChain) {
>+        encoder << false;
>+        return;
>+    }
>+
>+    encoder << true;
>+    CoreIPC::encode(encoder, certificateChain);
>+}
>+
>+bool ArgumentCoder<CertificateInfo>::decodePlatformData(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
>+{
>+    bool hasCertificateChain;
>+    if (!decoder.decode(hasCertificateChain))
>+        return false;
>+
>+    if (!hasCertificateChain)
>+        return true;
>+
>+    RetainPtr<CFArrayRef> certificateChain;
>+    if (!CoreIPC::decode(decoder, certificateChain))
>+        return false;
>+
>+    certificateInfo.setCertificateChain(certificateChain.get());
>+
>+    return true;
>+}
>+
> static NSString* nsString(const String& string)
> {
>     return string.impl() ? [NSString stringWithCharacters:reinterpret_cast<const UniChar*>(string.characters()) length:string.length()] : @"";
>diff --git a/Source/WebKit2/Shared/soup/CertificateInfo.cpp b/Source/WebKit2/Shared/soup/CertificateInfo.cpp
>deleted file mode 100644
>index 9e92518..0000000
>--- a/Source/WebKit2/Shared/soup/CertificateInfo.cpp
>+++ /dev/null
>@@ -1,116 +0,0 @@
>-/*
>- * Copyright (C) 2012 Igalia S.L.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "CertificateInfo.h"
>-
>-#include "ArgumentDecoder.h"
>-#include "ArgumentEncoder.h"
>-#include "DataReference.h"
>-#include <WebCore/ResourceError.h>
>-#include <WebCore/ResourceResponse.h>
>-#include <libsoup/soup.h>
>-
>-using namespace WebCore;
>-
>-namespace WebKit {
>-
>-CertificateInfo::CertificateInfo()
>-    : m_tlsErrors(static_cast<GTlsCertificateFlags>(0))
>-{
>-}
>-
>-CertificateInfo::CertificateInfo(const ResourceResponse& response)
>-    : m_certificate(response.soupMessageCertificate())
>-    , m_tlsErrors(response.soupMessageTLSErrors())
>-{
>-}
>-
>-CertificateInfo::CertificateInfo(const ResourceError& resourceError)
>-    : m_certificate(resourceError.certificate())
>-    , m_tlsErrors(static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()))
>-{
>-}
>-
>-CertificateInfo::CertificateInfo(GTlsCertificate* certificate, GTlsCertificateFlags tlsErrors)
>-    : m_certificate(certificate)
>-    , m_tlsErrors(tlsErrors)
>-{
>-}
>-
>-CertificateInfo::~CertificateInfo()
>-{
>-}
>-
>-void CertificateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
>-{
>-    if (!m_certificate) {
>-        encoder << false;
>-        return;
>-    }
>-
>-    GByteArray* certificateData = 0;
>-    g_object_get(G_OBJECT(m_certificate.get()), "certificate", &certificateData, NULL);
>-    if (!certificateData) {
>-        encoder << false;
>-        return;
>-    }
>-
>-    encoder << true;
>-    GRefPtr<GByteArray> certificate = adoptGRef(certificateData);
>-    encoder.encodeVariableLengthByteArray(CoreIPC::DataReference(certificate->data, certificate->len));
>-    encoder << static_cast<uint32_t>(m_tlsErrors);
>-}
>-
>-bool CertificateInfo::decode(CoreIPC::ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
>-{
>-    bool hasCertificate;
>-    if (!decoder.decode(hasCertificate))
>-        return false;
>-
>-    if (!hasCertificate)
>-        return true;
>-
>-    CoreIPC::DataReference certificateDataReference;
>-    if (!decoder.decodeVariableLengthByteArray(certificateDataReference))
>-        return false;
>-
>-    GByteArray* certificateData = g_byte_array_sized_new(certificateDataReference.size());
>-    certificateData = g_byte_array_append(certificateData, certificateDataReference.data(), certificateDataReference.size());
>-    GRefPtr<GByteArray> certificate = adoptGRef(certificateData);
>-
>-    GTlsBackend* backend = g_tls_backend_get_default();
>-    certificateInfo.m_certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new(
>-        g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", certificate.get(), nullptr)));
>-
>-    uint32_t tlsErrors;
>-    if (!decoder.decode(tlsErrors))
>-        return false;
>-    certificateInfo.m_tlsErrors = static_cast<GTlsCertificateFlags>(tlsErrors);
>-
>-    return true;
>-}
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit2/Shared/soup/CertificateInfo.h b/Source/WebKit2/Shared/soup/CertificateInfo.h
>deleted file mode 100644
>index eb558aa..0000000
>--- a/Source/WebKit2/Shared/soup/CertificateInfo.h
>+++ /dev/null
>@@ -1,66 +0,0 @@
>-/*
>- * Copyright (C) 2010 Apple Inc. All rights reserved.
>- * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef CertificateInfo_h
>-#define CertificateInfo_h
>-
>-#include <libsoup/soup.h>
>-#include <wtf/gobject/GRefPtr.h>
>-
>-namespace CoreIPC {
>-class ArgumentDecoder;
>-class ArgumentEncoder;
>-}
>-
>-namespace WebCore {
>-class ResourceError;
>-class ResourceResponse;
>-}
>-
>-namespace WebKit {
>-
>-class CertificateInfo {
>-public:
>-    CertificateInfo();
>-    explicit CertificateInfo(const WebCore::ResourceResponse&);
>-    explicit CertificateInfo(const WebCore::ResourceError&);
>-    explicit CertificateInfo(GTlsCertificate*, GTlsCertificateFlags);
>-    ~CertificateInfo();
>-
>-    GTlsCertificate* certificate() const { return m_certificate.get(); }
>-    GTlsCertificateFlags tlsErrors() const { return m_tlsErrors; }
>-
>-    void encode(CoreIPC::ArgumentEncoder&) const;
>-    static bool decode(CoreIPC::ArgumentDecoder&, CertificateInfo&);
>-
>-private:
>-    GRefPtr<GTlsCertificate> m_certificate;
>-    GTlsCertificateFlags m_tlsErrors;
>-};
>-
>-} // namespace WebKit
>-
>-#endif // CertificateInfo_h
>diff --git a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>index 54c95f5..07cd136 100644
>--- a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>+++ b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2010 Apple Inc. All rights reserved.
>  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
>+ * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -25,16 +26,16 @@
>  */
> 
> #include "config.h"
>+#include "DataReference.h"
> #include "WebCoreArgumentCoders.h"
> 
>-#include "CertificateInfo.h"
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/ResourceError.h>
> #include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
> #include <wtf/text/CString.h>
> 
> using namespace WebCore;
>-using namespace WebKit;
> 
> namespace CoreIPC {
> 
>@@ -67,6 +68,55 @@ bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder& decode
>     return true;
> }
> 
>+void ArgumentCoder<CertificateInfo>::encodePlatformData(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
>+{
>+    if (!certificateInfo.certificate()) {
>+        encoder << false;
>+        return;
>+    }
>+
>+    GByteArray* certificateData = 0;
>+    g_object_get(G_OBJECT(certificateInfo.certificate()), "certificate", &certificateData, NULL);
>+    if (!certificateData) {
>+        encoder << false;
>+        return;
>+    }
>+
>+    encoder << true;
>+    GRefPtr<GByteArray> certificate = adoptGRef(certificateData);
>+    encoder.encodeVariableLengthByteArray(CoreIPC::DataReference(certificate->data, certificate->len));
>+    encoder << static_cast<uint32_t>(certificateInfo.tlsErrors());
>+}
>+
>+bool ArgumentCoder<CertificateInfo>::decodePlatformData(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
>+{
>+    bool hasCertificate;
>+    if (!decoder.decode(hasCertificate))
>+        return false;
>+
>+    if (!hasCertificate)
>+        return true;
>+
>+    CoreIPC::DataReference certificateDataReference;
>+    if (!decoder.decodeVariableLengthByteArray(certificateDataReference))
>+        return false;
>+
>+    GByteArray* certificateData = g_byte_array_sized_new(certificateDataReference.size());
>+    certificateData = g_byte_array_append(certificateData, certificateDataReference.data(), certificateDataReference.size());
>+    GRefPtr<GByteArray> certificateBytes = adoptGRef(certificateData);
>+
>+    GTlsBackend* backend = g_tls_backend_get_default();
>+    GRefPtr<GTlsCertificate> certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new(
>+        g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", certificateBytes.get(), nullptr)));
>+    certificateInfo.setCertificate(certificate.get());
>+
>+    uint32_t tlsErrors;
>+    if (!decoder.decode(tlsErrors))
>+        return false;
>+    certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors));
>+
>+    return true;
>+}
> 
> void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
> {
>diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
>index b588040..2a8172b 100644
>--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
>+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
>@@ -21,7 +21,6 @@
> #include "config.h"
> #include "WebKitWebView.h"
> 
>-#include "CertificateInfo.h"
> #include "ImageOptions.h"
> #include "WebCertificateInfo.h"
> #include "WebContextMenuItem.h"
>@@ -60,6 +59,7 @@
> #include "WebKitWebViewPrivate.h"
> #include "WebKitWindowPropertiesPrivate.h"
> #include <JavaScriptCore/APICast.h>
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/DragIcon.h>
> #include <WebCore/GOwnPtrGtk.h>
> #include <WebCore/GOwnPtrSoup.h>
>@@ -3028,7 +3028,7 @@ gboolean webkit_web_view_get_tls_info(WebKitWebView* webView, GTlsCertificate**
>     if (!mainFrame)
>         return FALSE;
> 
>-    const CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
>+    const WebCore::CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
>     if (certificate)
>         *certificate = certificateInfo.certificate();
>     if (errors)
>diff --git a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>index 8d20c76..d5573da 100644
>--- a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>+++ b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
>@@ -66,7 +66,7 @@ void AuthenticationChallengeProxy::useCredential(WebCredential* credential)
>         m_connection->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(m_challengeID), 0);
>     else {
>         WebCertificateInfo* certificateInfo = credential->certificateInfo();
>-        CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : CertificateInfo();
>+        WebCore::CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : WebCore::CertificateInfo();
>         m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core(), platformInfo), 0);
>     }
> 
>diff --git a/Source/WebKit2/UIProcess/WebFrameProxy.cpp b/Source/WebKit2/UIProcess/WebFrameProxy.cpp
>index 673e7ec..2ef3c59 100644
>--- a/Source/WebKit2/UIProcess/WebFrameProxy.cpp
>+++ b/Source/WebKit2/UIProcess/WebFrameProxy.cpp
>@@ -131,7 +131,7 @@ void WebFrameProxy::didFailProvisionalLoad()
>     m_frameLoadState.didFailProvisionalLoad();
> }
> 
>-void WebFrameProxy::didCommitLoad(const String& contentType, const CertificateInfo& certificateInfo)
>+void WebFrameProxy::didCommitLoad(const String& contentType, const WebCore::CertificateInfo& certificateInfo)
> {
>     m_frameLoadState.didCommitLoad();
> 
>diff --git a/Source/WebKit2/UIProcess/WebFrameProxy.h b/Source/WebKit2/UIProcess/WebFrameProxy.h
>index 7b85ff2..7ae9918 100644
>--- a/Source/WebKit2/UIProcess/WebFrameProxy.h
>+++ b/Source/WebKit2/UIProcess/WebFrameProxy.h
>@@ -40,9 +40,11 @@ namespace CoreIPC {
>     class Connection;
> }
> 
>-namespace WebKit {
>-
>+namespace WebCore {
> class CertificateInfo;
>+}
>+
>+namespace WebKit {
> class WebCertificateInfo;
> class WebFormSubmissionListenerProxy;
> class WebFramePolicyListenerProxy;
>@@ -99,7 +101,7 @@ public:
>     void didStartProvisionalLoad(const String& url);
>     void didReceiveServerRedirectForProvisionalLoad(const String& url);
>     void didFailProvisionalLoad();
>-    void didCommitLoad(const String& contentType, const CertificateInfo&);
>+    void didCommitLoad(const String& contentType, const WebCore::CertificateInfo&);
>     void didFinishLoad();
>     void didFailLoad();
>     void didSameDocumentNavigation(const String&); // eg. anchor navigation, session state change.
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>index defa1e5..1ef5ca5 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
>@@ -2212,7 +2212,7 @@ void WebPageProxy::clearLoadDependentCallbacks()
>     }
> }
> 
>-void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
>+void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
> {
>     RefPtr<API::Object> userData;
>     WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
>index 3edc8a8..f6df426 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
>@@ -772,7 +772,7 @@ private:
>     void didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, CoreIPC::MessageDecoder&);
>     void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
>     void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
>-    void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const CertificateInfo&, CoreIPC::MessageDecoder&);
>+    void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, CoreIPC::MessageDecoder&);
>     void didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
>     void didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
>     void didFailLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>index acaf71a..6d1ca0a 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
>@@ -111,7 +111,7 @@ messages -> WebPageProxy {
>     DidCreateSubframe(uint64_t frameID)
> 
>     # Frame load messages
>-    DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebKit::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
>+    DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
>     DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
>     DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
>     DidFinishDocumentLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
>diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
>index 305a6d8..c675a01 100644
>--- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
>+++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
>@@ -1130,8 +1130,6 @@
> 		BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF18637167D071E00A1A85A /* CacheModel.cpp */; };
> 		BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
> 		BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; };
>-		BCF505E71243047B005955AE /* CertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF505E51243047B005955AE /* CertificateInfo.h */; };
>-		BCF505E81243047B005955AE /* CertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF505E61243047B005955AE /* CertificateInfo.mm */; };
> 		BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
> 		BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
> 		BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
>@@ -2695,8 +2693,6 @@
> 		BCF18637167D071E00A1A85A /* CacheModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheModel.cpp; sourceTree = "<group>"; };
> 		BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; };
> 		BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
>-		BCF505E51243047B005955AE /* CertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertificateInfo.h; sourceTree = "<group>"; };
>-		BCF505E61243047B005955AE /* CertificateInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CertificateInfo.mm; sourceTree = "<group>"; };
> 		BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
> 		BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
> 		BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHistoryClient.cpp; sourceTree = "<group>"; };
>@@ -4641,8 +4637,6 @@
> 				C574A58012E66681002DFE98 /* PasteboardTypes.mm */,
> 				E19582D2153CBFD700B60875 /* PDFKitImports.h */,
> 				E19582D4153CC05300B60875 /* PDFKitImports.mm */,
>-				BCF505E51243047B005955AE /* CertificateInfo.h */,
>-				BCF505E61243047B005955AE /* CertificateInfo.mm */,
> 				E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */,
> 				2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */,
> 				2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */,
>@@ -5632,7 +5626,6 @@
> 				C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */,
> 				E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */,
> 				51FCB18917BBFE0300394CD8 /* SynchronousNetworkLoaderClient.h in Headers */,
>-				BCF505E71243047B005955AE /* CertificateInfo.h in Headers */,
> 				1AE00D4F182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h in Headers */,
> 				BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */,
> 				BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */,
>@@ -6945,7 +6938,6 @@
> 				2D2ADF1016364D8200197E47 /* PDFPluginChoiceAnnotation.mm in Sources */,
> 				2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
> 				2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
>-				BCF505E81243047B005955AE /* CertificateInfo.mm in Sources */,
> 				BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
> 				1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
> 				31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>index a5b8449c..c7fb4d7 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>@@ -28,7 +28,6 @@
> 
> #if ENABLE(NETWORK_PROCESS)
> 
>-#include "CertificateInfo.h"
> #include "DataReference.h"
> #include "Logging.h"
> #include "NetworkProcessConnection.h"
>@@ -36,6 +35,7 @@
> #include "WebCoreArgumentCoders.h"
> #include "WebErrors.h"
> #include "WebProcess.h"
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/DocumentLoader.h>
> #include <WebCore/ResourceBuffer.h>
> #include <WebCore/ResourceError.h>
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>index fd2efa2..f745219 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>@@ -40,6 +40,7 @@ class DataReference;
> }
> 
> namespace WebCore {
>+class CertificateInfo;
> class ProtectionSpace;
> class ResourceBuffer;
> class ResourceError;
>@@ -50,7 +51,6 @@ class ResourceResponse;
> 
> namespace WebKit {
> 
>-class CertificateInfo;
> typedef uint64_t ResourceLoadIdentifier;
> 
> class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender {
>@@ -76,7 +76,7 @@ private:
> 
>     void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
>     void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent);
>-    void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
>+    void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
>     void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength);
>     void didFinishResourceLoad(double finishTime);
>     void didFailResourceLoad(const WebCore::ResourceError&);
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>index 98a878f..4a62042 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>@@ -29,7 +29,7 @@ messages -> WebResourceLoader LegacyReceiver {
>     // FIXME (NetworkProcess): We'll need much more granularity for response messages.
>     WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
>     DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
>-    DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebKit::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
>+    DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
>     DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
>     DidFinishResourceLoad(double finishTime)
>     DidFailResourceLoad(WebCore::ResourceError error)
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>index 59ff8d8..e14b9ae 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>@@ -27,7 +27,6 @@
> #include "WebFrameLoaderClient.h"
> 
> #include "AuthenticationManager.h"
>-#include "CertificateInfo.h"
> #include "DataReference.h"
> #include "InjectedBundle.h"
> #include "InjectedBundleBackForwardListItem.h"
>@@ -51,6 +50,7 @@
> #include "WebProcessProxyMessages.h"
> #include <JavaScriptCore/APICast.h>
> #include <JavaScriptCore/JSObject.h>
>+#include <WebCore/CertificateInfo.h>
> #include <WebCore/Chrome.h>
> #include <WebCore/DOMWrapperWorld.h>
> #include <WebCore/DocumentLoader.h>
>diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h
>index e80999f..a55ac15 100644
>--- a/Source/WebKit2/WebProcess/WebProcess.h
>+++ b/Source/WebKit2/WebProcess/WebProcess.h
>@@ -51,6 +51,9 @@ namespace WebCore {
> class PageGroup;
> class ResourceRequest;
> struct PluginInfo;
>+#if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
>+class CertificateInfo;
>+#endif
> }
> 
> namespace WebKit {
>@@ -72,10 +75,6 @@ struct WebProcessCreationParameters;
> #if ENABLE(NETWORK_PROCESS)
> class NetworkProcessConnection;
> class WebResourceLoadScheduler;
>-#else
>-#if USE(SOUP)
>-class CertificateInfo;
>-#endif
> #endif
> 
> #if ENABLE(DATABASE_PROCESS)
>@@ -174,7 +173,7 @@ public:
>     void updateActivePages();
> 
> #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
>-    void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
>+    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
> #endif
> 
> private:
>diff --git a/Source/WebKit2/WebProcess/WebProcess.messages.in b/Source/WebKit2/WebProcess/WebProcess.messages.in
>index d2c4ac0..907b784 100644
>--- a/Source/WebKit2/WebProcess/WebProcess.messages.in
>+++ b/Source/WebKit2/WebProcess/WebProcess.messages.in
>@@ -87,6 +87,6 @@ messages -> WebProcess LegacyReceiver {
> #endif
> 
> #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
>-    AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, WTF::String host)
>+    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, WTF::String host)
> #endif
> }
>diff --git a/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp b/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>index c0c206c..691db3a 100644
>--- a/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>+++ b/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>@@ -210,7 +210,7 @@ void WebProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
> }
> 
> #if !ENABLE(NETWORK_PROCESS)
>-void WebProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
>+void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
> {
>     WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 124720: 217578 | 217579 | 217580 | 217801 | 217803 | 217804 | 217806 | 217938 | 218046 | 218048 | 218684 | 218751 | 218793 | 219068