Title: [190986] releases/WebKitGTK/webkit-2.10/Source/WebKit2
- Revision
- 190986
- Author
- [email protected]
- Date
- 2015-10-13 06:48:23 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r189912 - [GTK] Crash in WebKit::BackingStore::createBackend running under Wayland
https://bugs.webkit.org/show_bug.cgi?id=147453
Reviewed by Carlos Garcia Campos.
Except when running on X11, this function always crashes if called before the web view is
realized, as gdk_window_create_similar_surface will return null in that case. Avoid this by
simply realizing the widget before calling that.
Thanks to Carlos Garnacho for some debugging help.
* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit::BackingStore::createBackend):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190985 => 190986)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 13:47:19 UTC (rev 190985)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 13:48:23 UTC (rev 190986)
@@ -1,3 +1,19 @@
+2015-09-17 Michael Catanzaro <[email protected]>
+
+ [GTK] Crash in WebKit::BackingStore::createBackend running under Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=147453
+
+ Reviewed by Carlos Garcia Campos.
+
+ Except when running on X11, this function always crashes if called before the web view is
+ realized, as gdk_window_create_similar_surface will return null in that case. Avoid this by
+ simply realizing the widget before calling that.
+
+ Thanks to Carlos Garnacho for some debugging help.
+
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ (WebKit::BackingStore::createBackend):
+
2015-10-12 Philip Chimento <[email protected]>
[GTK] OSX linker doesn't understand --whole-archive
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (190985 => 190986)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-10-13 13:47:19 UTC (rev 190985)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-10-13 13:48:23 UTC (rev 190986)
@@ -63,7 +63,9 @@
scaledSize.scale(m_deviceScaleFactor);
#if PLATFORM(GTK)
- RefPtr<cairo_surface_t> surface = adoptRef(gdk_window_create_similar_surface(gtk_widget_get_window(m_webPageProxy.viewWidget()),
+ GtkWidget* viewWidget = m_webPageProxy.viewWidget();
+ gtk_widget_realize(viewWidget);
+ RefPtr<cairo_surface_t> surface = adoptRef(gdk_window_create_similar_surface(gtk_widget_get_window(viewWidget),
CAIRO_CONTENT_COLOR_ALPHA, scaledSize.width(), scaledSize.height()));
#else
RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, scaledSize.width(), scaledSize.height()));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
