Changeset 189912 in webkit

Timestamp:

Sep 17, 2015 6:00:48 AM (9 years ago)

Author:

Michael Catanzaro

Message:

[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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/cairo/BackingStoreCairo.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-17  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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-09-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp

@@ -64 +64 @@
 
 #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