Title: [197352] trunk/Source/WebKit2
- Revision
- 197352
- Author
- commit-qu...@webkit.org
- Date
- 2016-02-29 07:03:41 -0800 (Mon, 29 Feb 2016)
Log Message
Fixed compilation with !ENABLE(DATABASE_PROCESS).
https://bugs.webkit.org/show_bug.cgi?id=154813
Patch by Konstantin Tokarev <annu...@yandex.ru> on 2016-02-29
Reviewed by Michael Catanzaro.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::terminateDatabaseProcess): Added missing #if
guard.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197351 => 197352)
--- trunk/Source/WebKit2/ChangeLog 2016-02-29 15:01:55 UTC (rev 197351)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-29 15:03:41 UTC (rev 197352)
@@ -1,3 +1,14 @@
+2016-02-29 Konstantin Tokarev <annu...@yandex.ru>
+
+ 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 <apla...@igalia.com>
[GTK] Touch slider test fails due to assertion in webkitWebViewBaseTouchEvent()
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (197351 => 197352)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-29 15:01:55 UTC (rev 197351)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-29 15:03:41 UTC (rev 197352)
@@ -1090,12 +1090,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes