Title: [191563] releases/WebKitGTK/webkit-2.10/Source/WebKit2
- Revision
- 191563
- Author
- [email protected]
- Date
- 2015-10-26 00:44:48 -0700 (Mon, 26 Oct 2015)
Log Message
Merge r191338 - [GTK] Fix build for ENABLE_PLUGIN_PROCESS_GTK2=OFF
https://bugs.webkit.org/show_bug.cgi?id=150086
Reviewed by Darin Adler.
* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit::BackingStore::createBackend):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (191562 => 191563)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-26 07:43:01 UTC (rev 191562)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-26 07:44:48 UTC (rev 191563)
@@ -1,3 +1,13 @@
+2015-10-20 Sergio Villar Senin <[email protected]>
+
+ [GTK] Fix build for ENABLE_PLUGIN_PROCESS_GTK2=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=150086
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ (WebKit::BackingStore::createBackend):
+
2015-10-19 Carlos Garcia Campos <[email protected]>
[GTK] ASSERTION FAILED: parent in WebInspectorProxy::platformDetach()
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (191562 => 191563)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-10-26 07:43:01 UTC (rev 191562)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-10-26 07:44:48 UTC (rev 191563)
@@ -36,6 +36,10 @@
#include <WebCore/RefPtrCairo.h>
#include <cairo.h>
+#if PLATFORM(GTK)
+#include <gtk/gtk.h>
+#endif
+
#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
#include <WebCore/BackingStoreBackendCairoX11.h>
#include <WebCore/PlatformDisplayX11.h>
@@ -48,7 +52,7 @@
std::unique_ptr<BackingStoreBackendCairo> BackingStore::createBackend()
{
-#if PLATFORM(GTK) && PLATFORM(X11)
+#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
const auto& sharedDisplay = PlatformDisplay::sharedDisplay();
if (is<PlatformDisplayX11>(sharedDisplay)) {
GdkVisual* visual = gtk_widget_get_visual(m_webPageProxy.viewWidget());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
