Unreviewed build fix attempt on Soup based port after r157842.
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 06:03:30 +0000 (06:03 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 06:03:30 +0000 (06:03 +0000)
WebCore::CertificateInfo was reverted to WebKit::PlatformCertificateInfo.

* UIProcess/WebContext.cpp:
(WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::allowSpecificHTTPSCertificateForHost):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/WebProcess/WebProcess.messages.in
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

index 988725b..c69e46c 100644 (file)
@@ -1,5 +1,18 @@
 2013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
 
+        Unreviewed build fix attempt on Soup based port after r157842.
+
+        WebCore::CertificateInfo was reverted to WebKit::PlatformCertificateInfo.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::WebProcess::allowSpecificHTTPSCertificateForHost):
+
+2013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
+
         Unreviewed build fix attempt on EFL port after r157842.
 
         * Shared/soup/PlatformCertificateInfo.h: Removed message of merge confliction.
index 7f4788f..50e18fb 100644 (file)
@@ -1090,7 +1090,7 @@ void WebContext::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*
     }
 #else
 #if USE(SOUP)
-    m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
+    m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->platformCertificateInfo(), host), 0);
     return;
 #else
     UNUSED_PARAM(certificate);
index 7f7858b..96e4ec8 100644 (file)
@@ -72,6 +72,10 @@ struct WebProcessCreationParameters;
 #if ENABLE(NETWORK_PROCESS)
 class NetworkProcessConnection;
 class WebResourceLoadScheduler;
+#else
+#if USE(SOUP)
+class PlatformCertificateInfo;
+#endif
 #endif
 
 #if ENABLE(DATABASE_PROCESS)
@@ -170,7 +174,7 @@ public:
     void updateActivePages();
 
 #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
-    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
+    void allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String& host);
 #endif
 
 private:
index 718d8fa..532b4c2 100644 (file)
@@ -84,6 +84,6 @@ messages -> WebProcess LegacyReceiver {
 #endif
 
 #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
-    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, WTF::String host)
+    AllowSpecificHTTPSCertificateForHost(WebKit::PlatformCertificateInfo certificate, WTF::String host)
 #endif
 }
index d6be58a..79cf97d 100644 (file)
@@ -31,6 +31,7 @@
 #include "SeccompFiltersWebProcessEfl.h"
 #endif
 
+#include "PlatformCertificateInfo.h"
 #include "WebCookieManager.h"
 #include "WebProcessCreationParameters.h"
 #include "WebSoupRequestManager.h"
@@ -209,7 +210,7 @@ void WebProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
 }
 
 #if !ENABLE(NETWORK_PROCESS)
-void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
+void WebProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo& certificateInfo, const String& host)
 {
     WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
 }