Title: [181789] trunk/Source/WebKit2
- Revision
- 181789
- Author
- zandober...@gmail.com
- Date
- 2015-03-20 01:24:42 -0700 (Fri, 20 Mar 2015)
Log Message
[GTK] Properly guard X11-specific code in BackingStore::createBackend()
https://bugs.webkit.org/show_bug.cgi?id=142875
Reviewed by Martin Robinson.
* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit::BackingStore::createBackend): Guard the GTK- and X11-specific
bit of code with PLATFORM(GTK) and PLATFORM(X11). Testing GDK_WINDOWING_X11
ensures that the GTK+ dependency has X11 support, but does not ensure
that WebKitGTK+ has been configured to build for X11 environments (which
is what PLATFORM(X11) ensures).
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181788 => 181789)
--- trunk/Source/WebKit2/ChangeLog 2015-03-20 08:07:39 UTC (rev 181788)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-20 08:24:42 UTC (rev 181789)
@@ -1,3 +1,17 @@
+2015-03-20 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Properly guard X11-specific code in BackingStore::createBackend()
+ https://bugs.webkit.org/show_bug.cgi?id=142875
+
+ Reviewed by Martin Robinson.
+
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ (WebKit::BackingStore::createBackend): Guard the GTK- and X11-specific
+ bit of code with PLATFORM(GTK) and PLATFORM(X11). Testing GDK_WINDOWING_X11
+ ensures that the GTK+ dependency has X11 support, but does not ensure
+ that WebKitGTK+ has been configured to build for X11 environments (which
+ is what PLATFORM(X11) ensures).
+
2015-03-19 Chris Dumez <cdu...@apple.com>
[WK2] We should allow stale content when restoring a killed / crashed WebProcess
Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (181788 => 181789)
--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-03-20 08:07:39 UTC (rev 181788)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-03-20 08:24:42 UTC (rev 181789)
@@ -47,7 +47,7 @@
std::unique_ptr<BackingStoreBackendCairo> BackingStore::createBackend()
{
-#if PLATFORM(GTK) && defined(GDK_WINDOWING_X11)
+#if PLATFORM(GTK) && PLATFORM(X11)
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
if (GDK_IS_X11_DISPLAY(display)) {
GdkVisual* visual = gtk_widget_get_visual(m_webPageProxy.viewWidget());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
