Title: [197662] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 197662
- Author
- [email protected]
- Date
- 2016-03-07 01:25:46 -0800 (Mon, 07 Mar 2016)
Log Message
Merge r197352 - Fixed compilation with !ENABLE(DATABASE_PROCESS).
https://bugs.webkit.org/show_bug.cgi?id=154813
Patch by Konstantin Tokarev <[email protected]> on 2016-02-29
Reviewed by Michael Catanzaro.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::terminateDatabaseProcess): Added missing #if
guard.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (197661 => 197662)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 09:24:45 UTC (rev 197661)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 09:25:46 UTC (rev 197662)
@@ -1,3 +1,14 @@
+2016-02-29 Konstantin Tokarev <[email protected]>
+
+ Fixed compilation with !ENABLE(DATABASE_PROCESS).
+ https://bugs.webkit.org/show_bug.cgi?id=154813
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::terminateDatabaseProcess): Added missing #if
+ guard.
+
2016-02-29 Adrien Plazas <[email protected]>
[GTK] Touch slider test fails due to assertion in webkitWebViewBaseTouchEvent()
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessPool.cpp (197661 => 197662)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-03-07 09:24:45 UTC (rev 197661)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-03-07 09:25:46 UTC (rev 197662)
@@ -1074,12 +1074,14 @@
void WebProcessPool::terminateDatabaseProcess()
{
+#if ENABLE(DATABASE_PROCESS)
ASSERT(m_processes.isEmpty());
if (!m_databaseProcess)
return;
m_databaseProcess->terminate();
m_databaseProcess = nullptr;
+#endif
}
void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
