Title: [186801] trunk/Source/WebKit2
- Revision
- 186801
- Author
- zandober...@gmail.com
- Date
- 2015-07-14 01:53:30 -0700 (Tue, 14 Jul 2015)
Log Message
[GTK] Add a runtime check for X11 display in webkitWebViewBaseExitAcceleratedCompositingMode()
https://bugs.webkit.org/show_bug.cgi?id=146711
Reviewed by Carlos Garcia Campos.
webkitWebViewBaseExitAcceleratedCompositingMode() is already guarded with
X11 build guards, but it should also do a runtime check that the program
is running under an X11 display before proceeding.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDidRelaunchWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186800 => 186801)
--- trunk/Source/WebKit2/ChangeLog 2015-07-14 08:46:01 UTC (rev 186800)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-14 08:53:30 UTC (rev 186801)
@@ -1,3 +1,17 @@
+2015-07-14 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Add a runtime check for X11 display in webkitWebViewBaseExitAcceleratedCompositingMode()
+ https://bugs.webkit.org/show_bug.cgi?id=146711
+
+ Reviewed by Carlos Garcia Campos.
+
+ webkitWebViewBaseExitAcceleratedCompositingMode() is already guarded with
+ X11 build guards, but it should also do a runtime check that the program
+ is running under an X11 display before proceeding.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseDidRelaunchWebProcess):
+
2015-07-13 Matt Rajca <mra...@apple.com>
Media Session: add plumbing for delivering start/end-of-interruption events
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (186800 => 186801)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-14 08:46:01 UTC (rev 186800)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-14 08:53:30 UTC (rev 186801)
@@ -1369,6 +1369,9 @@
void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase* webkitWebViewBase)
{
#if PLATFORM(X11)
+ if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+ return;
+
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
ASSERT(drawingArea);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
