Title: [204097] trunk/Source/WebKit2
Revision
204097
Author
mcatanz...@igalia.com
Date
2016-08-03 13:06:22 -0700 (Wed, 03 Aug 2016)

Log Message

[SOUP] Deduplicate WebProcessPool::setIgnoreTLSErrors
https://bugs.webkit.org/show_bug.cgi?id=160489

Reviewed by Alex Christensen.

WebProcessPool::setIgnoreTLSErrors has identical implementation in WebProcessPoolEfl.cpp
and WebProcessPoolGtk.cpp. We have WebProcessPoolSoup.cpp and this function is specific to
the soup network backend, so move it there.

* UIProcess/efl/WebProcessPoolEfl.cpp:
(WebKit::WebProcessPool::setIgnoreTLSErrors): Deleted.
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::WebProcessPool::setIgnoreTLSErrors): Deleted.
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::WebProcessPool::setIgnoreTLSErrors):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (204096 => 204097)


--- trunk/Source/WebKit2/ChangeLog	2016-08-03 19:40:33 UTC (rev 204096)
+++ trunk/Source/WebKit2/ChangeLog	2016-08-03 20:06:22 UTC (rev 204097)
@@ -1,5 +1,23 @@
 2016-08-03  Michael Catanzaro  <mcatanz...@igalia.com>
 
+        [SOUP] Deduplicate WebProcessPool::setIgnoreTLSErrors
+        https://bugs.webkit.org/show_bug.cgi?id=160489
+
+        Reviewed by Alex Christensen.
+
+        WebProcessPool::setIgnoreTLSErrors has identical implementation in WebProcessPoolEfl.cpp
+        and WebProcessPoolGtk.cpp. We have WebProcessPoolSoup.cpp and this function is specific to
+        the soup network backend, so move it there.
+
+        * UIProcess/efl/WebProcessPoolEfl.cpp:
+        (WebKit::WebProcessPool::setIgnoreTLSErrors): Deleted.
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::WebProcessPool::setIgnoreTLSErrors): Deleted.
+        * UIProcess/soup/WebProcessPoolSoup.cpp:
+        (WebKit::WebProcessPool::setIgnoreTLSErrors):
+
+2016-08-03  Michael Catanzaro  <mcatanz...@igalia.com>
+
         [GTK] Document how to initialize WebKitFaviconDatabase
         https://bugs.webkit.org/show_bug.cgi?id=160391
 

Modified: trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp (204096 => 204097)


--- trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp	2016-08-03 19:40:33 UTC (rev 204096)
+++ trunk/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp	2016-08-03 20:06:22 UTC (rev 204097)
@@ -28,7 +28,6 @@
 
 #include "APIProcessPoolConfiguration.h"
 #include "Logging.h"
-#include "NetworkProcessMessages.h"
 #include "WebCookieManagerProxy.h"
 #include "WebInspectorServer.h"
 #include "WebProcessCreationParameters.h"
@@ -135,11 +134,4 @@
     return API::WebsiteDataStore::defaultNetworkCacheDirectory();
 }
 
-void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
-{
-    m_ignoreTLSErrors = ignoreTLSErrors;
-    if (networkProcess())
-        networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
-}
-
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (204096 => 204097)


--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp	2016-08-03 19:40:33 UTC (rev 204096)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp	2016-08-03 20:06:22 UTC (rev 204097)
@@ -30,7 +30,6 @@
 
 #include "APIProcessPoolConfiguration.h"
 #include "Logging.h"
-#include "NetworkProcessMessages.h"
 #include "WebCookieManagerProxy.h"
 #include "WebInspectorServer.h"
 #include "WebProcessCreationParameters.h"
@@ -132,11 +131,4 @@
     return API::WebsiteDataStore::defaultNetworkCacheDirectory();
 }
 
-void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
-{
-    m_ignoreTLSErrors = ignoreTLSErrors;
-    if (networkProcess())
-        networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
-}
-
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (204096 => 204097)


--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp	2016-08-03 19:40:33 UTC (rev 204096)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp	2016-08-03 20:06:22 UTC (rev 204097)
@@ -27,6 +27,7 @@
 #include "WebProcessPool.h"
 
 #include "NetworkProcessCreationParameters.h"
+#include "NetworkProcessMessages.h"
 #include "WebCookieManagerProxy.h"
 #include "WebSoupCustomProtocolRequestManager.h"
 #include <WebCore/Language.h>
@@ -45,4 +46,11 @@
 #endif
 }
 
+void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+    m_ignoreTLSErrors = ignoreTLSErrors;
+    if (networkProcess())
+        networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
 }
+
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to