<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160487] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160487">160487</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-12 04:30:58 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move CertificateInfo to WebCore
https://bugs.webkit.org/show_bug.cgi?id=124720
Reviewed by Darin Adler.
Based on the patch by Kwang Yul Seo <skyul@company100.net>
Source/WebCore:
* 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): Added, because WebCoreArgumentCoders needs it.
* platform/network/mac/CertificateInfoMac.mm: Renamed from Source/WebKit2/Shared/mac/CertificateInfo.mm.
(WebCore::CertificateInfo::CertificateInfo): Moved encode() and decode() to WebCoreArgumentCodersMac.mm.
* platform/network/soup/CertificateInfo.cpp: Copied from Source/WebKit2/Shared/WebCertificateInfo.h.
(WebCore::CertificateInfo::CertificateInfo): Moved encode() and decode() to WebCoreArgumentCodersSoup.cpp.
* platform/network/soup/CertificateInfo.h: Renamed from Source/WebKit2/Shared/soup/CertificateInfo.h.
(WebCore::CertificateInfo::setCertificate): Added, because WebCoreArgumentCoders needs it.
(WebCore::CertificateInfo::setTLSErrors): Added, because WebCoreArgumentCoders needs it.
Source/WebKit2:
* 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):
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(CoreIPC::ArgumentCoder<CertificateInfo>::encode):
(CoreIPC::ArgumentCoder<CertificateInfo>::decode):
* Shared/soup/CertificateInfo.cpp: Removed.
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(CoreIPC::ArgumentCoder<CertificateInfo>::encode):
(CoreIPC::ArgumentCoder<CertificateInfo>::decode):
* UIProcess/API/gtk/WebKitCertificateInfoPrivate.h:
* 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefilelistam">trunk/Source/WebKit2/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp">trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKCertificateInfoMacmm">trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagermessagesin">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm">trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCertificateInfoh">trunk/Source/WebKit2/Shared/WebCertificateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp">trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCertificateInfoPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxycpp">trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCertificateInfoh">trunk/Source/WebCore/platform/network/mac/CertificateInfo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCertificateInfoMacmm">trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCertificateInfocpp">trunk/Source/WebCore/platform/network/soup/CertificateInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCertificateInfoh">trunk/Source/WebCore/platform/network/soup/CertificateInfo.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedmacCertificateInfoh">trunk/Source/WebKit2/Shared/mac/CertificateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCertificateInfomm">trunk/Source/WebKit2/Shared/mac/CertificateInfo.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupCertificateInfocpp">trunk/Source/WebKit2/Shared/soup/CertificateInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupCertificateInfoh">trunk/Source/WebKit2/Shared/soup/CertificateInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/ChangeLog 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-12 Csaba Osztrogonác <ossy@webkit.org>
+
+ Move CertificateInfo to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=124720
+
+ Reviewed by Darin Adler.
+
+ Based on the patch by Kwang Yul Seo <skyul@company100.net>
+
+ * 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): Added, because WebCoreArgumentCoders needs it.
+ * platform/network/mac/CertificateInfoMac.mm: Renamed from Source/WebKit2/Shared/mac/CertificateInfo.mm.
+ (WebCore::CertificateInfo::CertificateInfo): Moved encode() and decode() to WebCoreArgumentCodersMac.mm.
+ * platform/network/soup/CertificateInfo.cpp: Copied from Source/WebKit2/Shared/WebCertificateInfo.h.
+ (WebCore::CertificateInfo::CertificateInfo): Moved encode() and decode() to WebCoreArgumentCodersSoup.cpp.
+ * platform/network/soup/CertificateInfo.h: Renamed from Source/WebKit2/Shared/soup/CertificateInfo.h.
+ (WebCore::CertificateInfo::setCertificate): Added, because WebCoreArgumentCoders needs it.
+ (WebCore::CertificateInfo::setTLSErrors): Added, because WebCoreArgumentCoders needs it.
+
</ins><span class="cx"> 2013-12-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r160417.
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -5443,6 +5443,7 @@
</span><span class="cx"> Source/WebCore/platform/network/BlobRegistryImpl.h \
</span><span class="cx"> Source/WebCore/platform/network/BlobResourceHandle.cpp \
</span><span class="cx"> Source/WebCore/platform/network/BlobResourceHandle.h \
</span><ins>+ Source/WebCore/platform/network/soup/CertificateInfo.h \
</ins><span class="cx"> Source/WebCore/platform/network/BlobStorageData.h \
</span><span class="cx"> Source/WebCore/platform/network/FormDataBuilder.cpp \
</span><span class="cx"> Source/WebCore/platform/network/FormDataBuilder.h \
</span><span class="lines">@@ -5462,6 +5463,7 @@
</span><span class="cx"> Source/WebCore/platform/network/ResourceResponseBase.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/AuthenticationChallenge.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \
</span><ins>+ Source/WebCore/platform/network/soup/CertificateInfo.cpp \
</ins><span class="cx"> Source/WebCore/platform/network/soup/CookieJarSoup.cpp \
</span><span class="cx"> Source/WebCore/platform/network/soup/CookieJarSoup.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/CookieStorageSoup.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> platform/network/efl/NetworkStateNotifierEfl.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/soup/AuthenticationChallengeSoup.cpp
</span><ins>+ platform/network/soup/CertificateInfo.cpp
</ins><span class="cx"> platform/network/soup/CookieJarSoup.cpp
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -189,6 +189,7 @@
</span><span class="cx"> platform/network/gtk/CredentialBackingStore.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/soup/AuthenticationChallengeSoup.cpp
</span><ins>+ platform/network/soup/CertificateInfo.cpp
</ins><span class="cx"> platform/network/soup/CookieJarSoup.cpp
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -67,6 +67,9 @@
</span><span class="cx"> __ZN3WTF12AtomicString3addEPK10__CFString
</span><span class="cx"> __ZN3WTF6StringC1EP8NSString
</span><span class="cx"> __ZN3WTF6StringC1EPK10__CFString
</span><ins>+__ZN7WebCore15CertificateInfoC1ERKNS_16ResourceResponseE
+__ZN7WebCore15CertificateInfoC1EPK9__CFArray
+__ZN7WebCore15CertificateInfoC1Ev
</ins><span class="cx"> __ZN7WebCore10ClientRectC1ERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore10ClientRectC1ERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore10ClientRectC1Ev
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1954,7 +1954,10 @@
</span><span class="cx"> 5DF7F5C20F01F92A00526B4B /* CSSPropertyNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */; };
</span><span class="cx"> 5DFE8F560D16477B0076E937 /* ScheduledAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */; };
</span><span class="cx"> 5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; };
</span><ins>+ 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, ); }; };
</ins><span class="cx"> 5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */; };
</span><ins>+ 5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FE1D291178FD1F3001AA3C3 /* Security.framework */; };
</ins><span class="cx"> 626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */; };
</span><span class="cx"> 626CDE0F1140424C001E5A68 /* SpatialNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 628D214C12131ED10055DCFC /* NetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 628D214B12131ED10055DCFC /* NetworkingContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8719,7 +8722,10 @@
</span><span class="cx"> 5DA97ECC168E787B000E3676 /* SystemVersionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemVersionMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5DB1BC6810715A6400EFAA49 /* TransformSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformSource.h; sourceTree = "<group>"; };
</span><span class="cx"> 5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformSourceLibxslt.cpp; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
</ins><span class="cx"> 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSEventTarget.h; sourceTree = "<group>"; };
</span><ins>+ 5FE1D291178FD1F3001AA3C3 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../../../../../System/Library/Frameworks/Security.framework; sourceTree = "<group>"; };
</ins><span class="cx"> 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpatialNavigation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpatialNavigation.h; sourceTree = "<group>"; };
</span><span class="cx"> 628D214B12131ED10055DCFC /* NetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkingContext.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13593,6 +13599,7 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */,
</ins><span class="cx"> FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */,
</span><span class="cx"> 93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */,
</span><span class="cx"> FD2DBF1312B048A300ED98C6 /* AudioToolbox.framework in Frameworks */,
</span><span class="lines">@@ -13955,6 +13962,7 @@
</span><span class="cx"> 0867D691FE84028FC02AAC07 /* WebKit */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5FE1D291178FD1F3001AA3C3 /* Security.framework */,
</ins><span class="cx"> 65C97AF208EA908800ACD273 /* config.h */,
</span><span class="cx"> EDEC98020AED7E170059137F /* WebCorePrefix.h */,
</span><span class="cx"> 9307061309E0CA8200B17FE4 /* DerivedSources.make */,
</span><span class="lines">@@ -15515,6 +15523,8 @@
</span><span class="cx"> children = (
</span><span class="cx"> 514C76420CE9234E007EF3CD /* AuthenticationMac.h */,
</span><span class="cx"> 514C76430CE9234E007EF3CD /* AuthenticationMac.mm */,
</span><ins>+ 5F2DBBE8178E336900141486 /* CertificateInfo.h */,
+ 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */,
</ins><span class="cx"> E1424C8F164B460B00F32D40 /* CookieJarMac.mm */,
</span><span class="cx"> E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */,
</span><span class="cx"> E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */,
</span><span class="lines">@@ -24254,6 +24264,7 @@
</span><span class="cx"> 0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */,
</span><span class="cx"> 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
</span><span class="cx"> 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
</span><ins>+ 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
</ins><span class="cx"> 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */,
</span><span class="cx"> E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */,
</span><span class="cx"> BC5C762B1497FE1400BC4775 /* PlatformEvent.h in Headers */,
</span><span class="lines">@@ -28454,6 +28465,7 @@
</span><span class="cx"> 977E2E0E12F0FC9C00C13380 /* XSSAuditorDelegate.cpp in Sources */,
</span><span class="cx"> E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */,
</span><span class="cx"> FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
</span><ins>+ 5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */,
</ins><span class="cx"> FD1762DF176686D900D836A8 /* UpSampler.cpp in Sources */,
</span><span class="cx"> FD1762E3176686EA00D836A8 /* DownSampler.cpp in Sources */,
</span><span class="cx"> 6E84E9E017668BEE00815B68 /* RasterShape.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCertificateInfohfromrev160486trunkSourceWebKit2SharedmacCertificateInfoh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/mac/CertificateInfo.h (from rev 160486, trunk/Source/WebKit2/Shared/mac/CertificateInfo.h) (0 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CertificateInfo.h (rev 0)
+++ trunk/Source/WebCore/platform/network/mac/CertificateInfo.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCertificateInfoMacmmfromrev160486trunkSourceWebKit2SharedmacCertificateInfomm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm (from rev 160486, trunk/Source/WebKit2/Shared/mac/CertificateInfo.mm) (0 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm (rev 0)
+++ trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCertificateInfocppfromrev160486trunkSourceWebKit2SharedWebCertificateInfoh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/CertificateInfo.cpp (from rev 160486, trunk/Source/WebKit2/Shared/WebCertificateInfo.h) (0 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CertificateInfo.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/CertificateInfo.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+/*
+ * 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 <ResourceError.h>
+#include <ResourceResponse.h>
+#include <libsoup/soup.h>
+
+namespace WebCore {
+
+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()
+{
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCertificateInfohfromrev160486trunkSourceWebKit2SharedsoupCertificateInfoh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/CertificateInfo.h (from rev 160486, trunk/Source/WebKit2/Shared/soup/CertificateInfo.h) (0 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CertificateInfo.h (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/CertificateInfo.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * 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 WebCore {
+
+class ResourceError;
+class ResourceResponse;
+
+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(); }
+ void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }
+ GTlsCertificateFlags tlsErrors() const { return m_tlsErrors; }
+ void setTLSErrors(GTlsCertificateFlags tlsErrors) { m_tlsErrors = tlsErrors; }
+
+private:
+ GRefPtr<GTlsCertificate> m_certificate;
+ GTlsCertificateFlags m_tlsErrors;
+};
+
+} // namespace WebCore
+
+#endif // CertificateInfo_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2013-12-12 Csaba Osztrogonác <ossy@webkit.org>
+
+ Move CertificateInfo to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=124720
+
+ Reviewed by Darin Adler.
+
+ Based on the patch by Kwang Yul Seo <skyul@company100.net>
+
+ * 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):
+ * Shared/WebCoreArgumentCoders.cpp:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (CoreIPC::ArgumentCoder<CertificateInfo>::encode):
+ (CoreIPC::ArgumentCoder<CertificateInfo>::decode):
+ * Shared/soup/CertificateInfo.cpp: Removed.
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (CoreIPC::ArgumentCoder<CertificateInfo>::encode):
+ (CoreIPC::ArgumentCoder<CertificateInfo>::decode):
+ * UIProcess/API/gtk/WebKitCertificateInfoPrivate.h:
+ * 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):
+
</ins><span class="cx"> 2013-12-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use of ar T option not supported by older binutils
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.list.am (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -530,8 +530,6 @@
</span><span class="cx"> Source/WebKit2/Shared/SessionState.h \
</span><span class="cx"> Source/WebKit2/Shared/StatisticsData.cpp \
</span><span class="cx"> Source/WebKit2/Shared/StatisticsData.h \
</span><del>- Source/WebKit2/Shared/soup/CertificateInfo.cpp \
- Source/WebKit2/Shared/soup/CertificateInfo.h \
</del><span class="cx"> Source/WebKit2/Shared/soup/SoupCookiePersistentStorageType.h \
</span><span class="cx"> Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
</span><span class="cx"> Source/WebKit2/Shared/TextCheckerState.h \
</span><span class="lines">@@ -1425,8 +1423,6 @@
</span><span class="cx"> Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp \
</span><span class="cx"> Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
</span><span class="cx"> Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \
</span><del>- Source/WebKit2/Shared/soup/CertificateInfo.cpp \
- Source/WebKit2/Shared/soup/CertificateInfo.h \
</del><span class="cx"> Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
</span><span class="cx"> Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "AsynchronousNetworkLoaderClient.h"
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebResourceLoaderMessages.h"
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -35,10 +35,12 @@
</span><span class="cx"> #include "NetworkResourceLoadScheduler.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+class CertificateInfo;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><del>-
</del><span class="cx"> class AuthenticationManager;
</span><del>-class CertificateInfo;
</del><span class="cx"> class NetworkConnectionToWebProcess;
</span><span class="cx"> class NetworkProcessSupplement;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="lines">@@ -104,7 +106,7 @@
</span><span class="cx"> void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> void cancelDownload(uint64_t downloadID);
</span><span class="cx"> void setCacheModel(uint32_t);
</span><del>- void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
</del><ins>+ void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
</ins><span class="cx"> void getNetworkProcessStatistics(uint64_t callbackID);
</span><span class="cx"> void clearCacheForAllOrigins(uint32_t cachesToClear);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, String host)
</del><ins>+ AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
</ins><span class="cx">
</span><span class="cx"> GetNetworkProcessStatistics(uint64_t callbackID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AsynchronousNetworkLoaderClient.h"
</span><span class="cx"> #include "AuthenticationManager.h"
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkBlobRegistry.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx">
</span><del>-#import "CertificateInfo.h"
</del><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "ResourceCachesToClear.h"
</span><span class="lines">@@ -36,6 +35,7 @@
</span><span class="cx"> #import "SandboxInitializationParameters.h"
</span><span class="cx"> #import "SecItemShim.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><ins>+#import <WebCore/CertificateInfo.h>
</ins><span class="cx"> #import <WebCore/FileSystem.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> Shared/linux/SeccompFilters/Syscall.cpp
</span><span class="cx"> Shared/linux/SeccompFilters/SyscallPolicy.cpp
</span><span class="cx">
</span><del>- Shared/soup/CertificateInfo.cpp
</del><span class="cx"> Shared/soup/WebCoreArgumentCodersSoup.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/DefaultUndoController.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> Shared/linux/SeccompFilters/Syscall.cpp
</span><span class="cx"> Shared/linux/SeccompFilters/SyscallPolicy.cpp
</span><span class="cx">
</span><del>- Shared/soup/CertificateInfo.cpp
</del><span class="cx"> Shared/soup/WebCoreArgumentCodersSoup.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/DefaultUndoController.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKCertificateInfoMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx">
</span><ins>+using namespace WebCore;
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class AuthenticationChallenge;
- class Credential;
</del><ins>+class AuthenticationChallenge;
+class CertificateInfo;
+class Credential;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class CertificateInfo;
</del><span class="cx"> class ChildProcess;
</span><span class="cx"> class Download;
</span><span class="cx"> class WebFrame;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // Called for downloads with or without the NetworkProcess
</span><span class="cx"> void didReceiveAuthenticationChallenge(Download*, const WebCore::AuthenticationChallenge&);
</span><span class="cx">
</span><del>- void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const CertificateInfo&);
</del><ins>+ void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
</ins><span class="cx"> void continueWithoutCredentialForChallenge(uint64_t challengeID);
</span><span class="cx"> void cancelChallenge(uint64_t challengeID);
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // CoreIPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
</span><span class="cx">
</span><del>- bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&);
</del><ins>+ bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&);
</ins><span class="cx">
</span><span class="cx"> uint64_t establishIdentifierForChallenge(const WebCore::AuthenticationChallenge&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> AuthenticationManager {
</span><del>- void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebKit::CertificateInfo certificate);
</del><ins>+ void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebCore::CertificateInfo certificate);
</ins><span class="cx"> void ContinueWithoutCredentialForChallenge(uint64_t challengeID);
</span><span class="cx"> void CancelChallenge(uint64_t challengeID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(SEC_IDENTITY)
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include <Security/SecIdentity.h>
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -504,7 +504,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::CertificateInfo: {
</span><del>- CertificateInfo certificateInfo;
</del><ins>+ WebCore::CertificateInfo certificateInfo;
</ins><span class="cx"> if (!decoder.decode(certificateInfo))
</span><span class="cx"> return false;
</span><span class="cx"> coder.m_root = WebCertificateInfo::create(certificateInfo);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCertificateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCertificateInfo.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCertificateInfo.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/WebCertificateInfo.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -27,27 +27,27 @@
</span><span class="cx"> #define WebCertificateInfo_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "CertificateInfo.h"
</del><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebCertificateInfo : public API::ObjectImpl<API::Object::Type::CertificateInfo> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebCertificateInfo> create(const CertificateInfo& info)
</del><ins>+ static PassRefPtr<WebCertificateInfo> create(const WebCore::CertificateInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebCertificateInfo(info));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
</del><ins>+ const WebCore::CertificateInfo& certificateInfo() const { return m_certificateInfo; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebCertificateInfo(const CertificateInfo& info)
</del><ins>+ explicit WebCertificateInfo(const WebCore::CertificateInfo& info)
</ins><span class="cx"> : m_certificateInfo(info)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CertificateInfo m_certificateInfo;
</del><ins>+ WebCore::CertificateInfo m_certificateInfo;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/Cookie.h>
</span><span class="cx"> #include <WebCore/Credential.h>
</span><span class="cx"> #include <WebCore/Cursor.h>
</span><span class="lines">@@ -92,7 +93,6 @@
</span><span class="cx"> return SimpleArgumentCoder<TransformationMatrix>::decode(decoder, transformationMatrix);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void ArgumentCoder<FloatPoint>::encode(ArgumentEncoder& encoder, const FloatPoint& floatPoint)
</span><span class="cx"> {
</span><span class="cx"> SimpleArgumentCoder<FloatPoint>::encode(encoder, floatPoint);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AffineTransform;
</span><span class="cx"> class AuthenticationChallenge;
</span><ins>+class CertificateInfo;
</ins><span class="cx"> class Color;
</span><span class="cx"> class Credential;
</span><span class="cx"> class Cursor;
</span><span class="lines">@@ -103,6 +104,11 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::TransformationMatrix&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct ArgumentCoder<WebCore::CertificateInfo> {
+ static void encode(ArgumentEncoder&, const WebCore::CertificateInfo&);
+ static bool decode(ArgumentDecoder&, WebCore::CertificateInfo&);
+};
+
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::FloatPoint> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::FloatPoint&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::FloatPoint&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCertificateInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/CertificateInfo.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CertificateInfo.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/mac/CertificateInfo.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCertificateInfomm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/CertificateInfo.mm (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CertificateInfo.mm 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/mac/CertificateInfo.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Apple Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2013 Company 100 Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,14 +29,13 @@
</span><span class="cx">
</span><span class="cx"> #import "ArgumentCodersCF.h"
</span><span class="cx"> #import "DataReference.h"
</span><del>-#import "CertificateInfo.h"
</del><span class="cx"> #import "WebKitSystemInterface.h"
</span><ins>+#import <WebCore/CertificateInfo.h>
</ins><span class="cx"> #import <WebCore/KeyboardEvent.h>
</span><span class="cx"> #import <WebCore/ResourceError.h>
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><del>-using namespace WebKit;
</del><span class="cx">
</span><span class="cx"> namespace CoreIPC {
</span><span class="cx">
</span><span class="lines">@@ -134,6 +134,36 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
+{
+ CFArrayRef certificateChain = certificateInfo.certificateChain();
+ if (!certificateChain) {
+ encoder << false;
+ return;
+ }
+
+ encoder << true;
+ CoreIPC::encode(encoder, certificateChain);
+}
+
+bool ArgumentCoder<CertificateInfo>::decode(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;
+}
+
</ins><span class="cx"> static NSString* nsString(const String& string)
</span><span class="cx"> {
</span><span class="cx"> return string.impl() ? [NSString stringWithCharacters:reinterpret_cast<const UniChar*>(string.characters()) length:string.length()] : @"";
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupCertificateInfocpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/soup/CertificateInfo.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/CertificateInfo.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/soup/CertificateInfo.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,116 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupCertificateInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/soup/CertificateInfo.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/CertificateInfo.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/soup/CertificateInfo.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Apple Inc. All rights reserved.
</span><span class="cx"> * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
</span><ins>+ * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -25,16 +26,16 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "DataReference.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><del>-using namespace WebKit;
</del><span class="cx">
</span><span class="cx"> namespace CoreIPC {
</span><span class="cx">
</span><span class="lines">@@ -67,7 +68,56 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
+{
+ if (!certificateInfo.certificate()) {
+ encoder << false;
+ return;
+ }
</ins><span class="cx">
</span><ins>+ 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>::decode(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;
+}
+
</ins><span class="cx"> void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</span><span class="cx"> {
</span><span class="cx"> encoder << CertificateInfo(resourceError);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCertificateInfoPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> #ifndef WebKitCertificateInfoPrivate_h
</span><span class="cx"> #define WebKitCertificateInfoPrivate_h
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "WebKitCertificateInfo.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx">
</span><span class="cx"> struct _WebKitCertificateInfo {
</span><span class="cx"> _WebKitCertificateInfo(GTlsCertificate* certificate, GTlsCertificateFlags tlsErrors)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WebKit::CertificateInfo certificateInfo;
</del><ins>+ WebCore::CertificateInfo certificateInfo;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-const WebKit::CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*);
</del><ins>+const WebCore::CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitCertificateInfoPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitWebView.h"
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "ImageOptions.h"
</span><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebContextMenuItem.h"
</span><span class="lines">@@ -60,6 +59,7 @@
</span><span class="cx"> #include "WebKitWebViewPrivate.h"
</span><span class="cx"> #include "WebKitWindowPropertiesPrivate.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/DragIcon.h>
</span><span class="cx"> #include <WebCore/GOwnPtrGtk.h>
</span><span class="cx"> #include <WebCore/GOwnPtrSoup.h>
</span><span class="lines">@@ -3028,7 +3028,7 @@
</span><span class="cx"> if (!mainFrame)
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- const CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
</del><ins>+ const WebCore::CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
</ins><span class="cx"> if (certificate)
</span><span class="cx"> *certificate = certificateInfo.certificate();
</span><span class="cx"> if (errors)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> m_connection->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(m_challengeID), 0);
</span><span class="cx"> else {
</span><span class="cx"> WebCertificateInfo* certificateInfo = credential->certificateInfo();
</span><del>- CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : CertificateInfo();
</del><ins>+ WebCore::CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : WebCore::CertificateInfo();
</ins><span class="cx"> m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core(), platformInfo), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> m_frameLoadState.didFailProvisionalLoad();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::didCommitLoad(const String& contentType, const CertificateInfo& certificateInfo)
</del><ins>+void WebFrameProxy::didCommitLoad(const String& contentType, const WebCore::CertificateInfo& certificateInfo)
</ins><span class="cx"> {
</span><span class="cx"> m_frameLoadState.didCommitLoad();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -40,9 +40,11 @@
</span><span class="cx"> class Connection;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WebCore {
+class CertificateInfo;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><del>-
-class CertificateInfo;
</del><span class="cx"> class WebCertificateInfo;
</span><span class="cx"> class WebFormSubmissionListenerProxy;
</span><span class="cx"> class WebFramePolicyListenerProxy;
</span><span class="lines">@@ -100,7 +102,7 @@
</span><span class="cx"> void didStartProvisionalLoad(const String& url);
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoad(const String& url);
</span><span class="cx"> void didFailProvisionalLoad();
</span><del>- void didCommitLoad(const String& contentType, const CertificateInfo&);
</del><ins>+ void didCommitLoad(const String& contentType, const WebCore::CertificateInfo&);
</ins><span class="cx"> void didFinishLoad();
</span><span class="cx"> void didFailLoad();
</span><span class="cx"> void didSameDocumentNavigation(const String&); // eg. anchor navigation, session state change.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -2184,7 +2184,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
</del><ins>+void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const WebCore::CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx"> WebContextUserMessageDecoder messageDecoder(userData, process());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> void didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, CoreIPC::MessageDecoder&);
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
</span><span class="cx"> void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
</span><del>- void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const CertificateInfo&, CoreIPC::MessageDecoder&);
</del><ins>+ void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, CoreIPC::MessageDecoder&);
</ins><span class="cx"> void didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
</span><span class="cx"> void didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
</span><span class="cx"> void didFailLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> DidCreateSubframe(uint64_t frameID)
</span><span class="cx">
</span><span class="cx"> # Frame load messages
</span><del>- DidCommitLoadForFrame(uint64_t frameID, String mimeType, uint32_t loadType, WebKit::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</del><ins>+ DidCommitLoadForFrame(uint64_t frameID, String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</ins><span class="cx"> DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span><span class="cx"> DidFinishDocumentLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -1176,8 +1176,6 @@
</span><span class="cx"> BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF18637167D071E00A1A85A /* CacheModel.cpp */; };
</span><span class="cx"> BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
</span><span class="cx"> BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; };
</span><del>- BCF505E71243047B005955AE /* CertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF505E51243047B005955AE /* CertificateInfo.h */; };
- BCF505E81243047B005955AE /* CertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF505E61243047B005955AE /* CertificateInfo.mm */; };
</del><span class="cx"> BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
</span><span class="cx"> BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
</span><span class="cx"> BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
</span><span class="lines">@@ -2786,8 +2784,6 @@
</span><span class="cx"> BCF18637167D071E00A1A85A /* CacheModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheModel.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHistoryClient.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4769,8 +4765,6 @@
</span><span class="cx"> C574A58012E66681002DFE98 /* PasteboardTypes.mm */,
</span><span class="cx"> E19582D2153CBFD700B60875 /* PDFKitImports.h */,
</span><span class="cx"> E19582D4153CC05300B60875 /* PDFKitImports.mm */,
</span><del>- BCF505E51243047B005955AE /* CertificateInfo.h */,
- BCF505E61243047B005955AE /* CertificateInfo.mm */,
</del><span class="cx"> E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */,
</span><span class="cx"> 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */,
</span><span class="cx"> 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */,
</span><span class="lines">@@ -5778,7 +5772,6 @@
</span><span class="cx"> C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */,
</span><span class="cx"> E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */,
</span><span class="cx"> 51FCB18917BBFE0300394CD8 /* SynchronousNetworkLoaderClient.h in Headers */,
</span><del>- BCF505E71243047B005955AE /* CertificateInfo.h in Headers */,
</del><span class="cx"> 1AE00D4F182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h in Headers */,
</span><span class="cx"> BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */,
</span><span class="cx"> BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */,
</span><span class="lines">@@ -7119,7 +7112,6 @@
</span><span class="cx"> 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
</span><span class="cx"> 2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
</span><span class="cx"> 371B32DD184D67490013E2B2 /* WKNSURLProtectionSpace.mm in Sources */,
</span><del>- BCF505E81243047B005955AE /* CertificateInfo.mm in Sources */,
</del><span class="cx"> BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
</span><span class="cx"> 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
</span><span class="cx"> 31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx">
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -36,6 +35,7 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebErrors.h"
</span><span class="cx"> #include "WebProcess.h"
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/ResourceBuffer.h>
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class CertificateInfo;
</ins><span class="cx"> class ProtectionSpace;
</span><span class="cx"> class ResourceBuffer;
</span><span class="cx"> class ResourceError;
</span><span class="lines">@@ -50,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class CertificateInfo;
</del><span class="cx"> typedef uint64_t ResourceLoadIdentifier;
</span><span class="cx">
</span><span class="cx"> class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender {
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
</span><span class="cx"> void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent);
</span><del>- void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
</del><ins>+ void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
</ins><span class="cx"> void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength);
</span><span class="cx"> void didFinishResourceLoad(double finishTime);
</span><span class="cx"> void didFailResourceLoad(const WebCore::ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> // FIXME (NetworkProcess): We'll need much more granularity for response messages.
</span><span class="cx"> WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
</span><span class="cx"> DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
</span><del>- DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebKit::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
</del><ins>+ DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
</ins><span class="cx"> DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
</span><span class="cx"> DidFinishResourceLoad(double finishTime)
</span><span class="cx"> DidFailResourceLoad(WebCore::ResourceError error)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebFrameLoaderClient.h"
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationManager.h"
</span><del>-#include "CertificateInfo.h"
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "InjectedBundleBackForwardListItem.h"
</span><span class="lines">@@ -52,6 +51,7 @@
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="cx"> #include <JavaScriptCore/JSObject.h>
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><ins>+#include <WebCore/CertificateInfo.h>
</ins><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="cx"> #include <WebCore/DOMWrapperWorld.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class CertificateInfo;
</ins><span class="cx"> class PageGroup;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> struct PluginInfo;
</span><span class="lines">@@ -76,11 +77,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> class NetworkProcessConnection;
</span><span class="cx"> class WebResourceLoadScheduler;
</span><del>-#else
-#if USE(SOUP)
-class CertificateInfo;
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> class WebToDatabaseProcessConnection;
</span><span class="lines">@@ -178,7 +175,7 @@
</span><span class="cx"> void updateActivePages();
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
</span><del>- void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
</del><ins>+ void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -84,6 +84,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
</span><del>- AllowSpecificHTTPSCertificateForHost(WebKit::CertificateInfo certificate, String host)
</del><ins>+ AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (160486 => 160487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-12 12:21:10 UTC (rev 160486)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-12 12:30:58 UTC (rev 160487)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(NETWORK_PROCESS)
</span><del>-void WebProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
</del><ins>+void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>