Changeset 196916 in webkit

Timestamp:

Feb 22, 2016, 1:29:39 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196257 - [GTK] Fix crash when creating webview with g_object_new
​https://bugs.webkit.org/show_bug.cgi?id=153989

Patch by Danilo Cesar Lemes de Paula <​danilo.cesar@collabora.co.uk> on 2016-02-08
Reviewed by Carlos Garcia Campos.

g_object_new(WEBKIT_TYPE_WEB_VIEW, NULL) crashes webkit
as _WebKitWebViewBasePrivate constructor requires a mainloop, but
webkit is only initialized when a context is created (which
doesn't happen with a direct call to g_object_new).

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkit_web_view_base_class_init):

Location:

releases/WebKitGTK/webkit-2.10/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-08  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
+
+        [GTK] Fix crash when creating webview with g_object_new
+        https://bugs.webkit.org/show_bug.cgi?id=153989
+
+        Reviewed by Carlos Garcia Campos.
+
+        g_object_new(WEBKIT_TYPE_WEB_VIEW, NULL) crashes webkit
+        as _WebKitWebViewBasePrivate constructor requires a mainloop, but
+        webkit is only initialized when a context is created (which
+        doesn't happen with a direct call to g_object_new).
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkit_web_view_base_class_init):
+
 2016-02-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -43 +43 @@
 #include "WebFullScreenClientGtk.h"
 #include "WebInspectorProxy.h"
+#include "WebKit2Initialize.h"
 #include "WebKitAuthenticationDialog.h"
 #include "WebKitPrivate.h"
@@ -1101 +1102 @@
     containerClass->remove = webkitWebViewBaseContainerRemove;
     containerClass->forall = webkitWebViewBaseContainerForall;
+
+    // Before creating a WebKitWebViewBasePriv we need to be sure that WebKit is started.
+    // Usually starting a context triggers InitializeWebKit2, but in case
+    // we create a view without asking before for a default_context we get a crash.
+    WebKit::InitializeWebKit2();
 }