Title: [213366] trunk/Source/WebKit2
- Revision
- 213366
- Author
- [email protected]
- Date
- 2017-03-03 09:24:13 -0800 (Fri, 03 Mar 2017)
Log Message
[GTK] Ensure WebKitWebView always have a user content manager
https://bugs.webkit.org/show_bug.cgi?id=169130
Patch by Carlos Garcia Campos <[email protected]> on 2017-03-03
Reviewed by Michael Catanzaro.
User content manager is a construct only property, so if not set by the user the web view doesn't have any. We
can create a default one, like we do for settings, when user didn't provide one.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewConstructed):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213365 => 213366)
--- trunk/Source/WebKit2/ChangeLog 2017-03-03 14:16:10 UTC (rev 213365)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-03 17:24:13 UTC (rev 213366)
@@ -1,3 +1,16 @@
+2017-03-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Ensure WebKitWebView always have a user content manager
+ https://bugs.webkit.org/show_bug.cgi?id=169130
+
+ Reviewed by Michael Catanzaro.
+
+ User content manager is a construct only property, so if not set by the user the web view doesn't have any. We
+ can create a default one, like we do for settings, when user didn't provide one.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewConstructed):
+
2017-03-02 Sam Weinig <[email protected]>
Rename htmlediting.h/cpp to Editing.h/cpp
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (213365 => 213366)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-03-03 14:16:10 UTC (rev 213365)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-03-03 17:24:13 UTC (rev 213366)
@@ -656,6 +656,9 @@
if (!priv->settings)
priv->settings = adoptGRef(webkit_settings_new());
+ if (!priv->userContentManager)
+ priv->userContentManager = adoptGRef(webkit_user_content_manager_new());
+
if (priv->isEphemeral && !webkit_web_context_is_ephemeral(priv->context.get())) {
priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new_ephemeral());
webkitWebsiteDataManagerAddProcessPool(priv->websiteDataManager.get(), webkitWebContextGetProcessPool(priv->context.get()));
@@ -2259,8 +2262,7 @@
* webkit_web_view_get_user_content_manager:
* @web_view: a #WebKitWebView
*
- * Gets the user content manager associated to @web_view, or %NULL if the
- * view does not have an user content manager.
+ * Gets the user content manager associated to @web_view.
*
* Returns: (transfer none): the #WebKitUserContentManager associated with the view
*
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
