Title: [98241] trunk/Source/WebKit2
- Revision
- 98241
- Author
- [email protected]
- Date
- 2011-10-24 08:17:25 -0700 (Mon, 24 Oct 2011)
Log Message
[GTK] Add helper function to set the loader client in WebKitWebView
https://bugs.webkit.org/show_bug.cgi?id=70594
Reviewed by Martin Robinson.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewSetLoaderClient): Helper function to set the loader
client.
(webkitWebViewConstructed): Use webkitWebViewSetLoaderClient() to
avoid unnecessary checks.
(webkit_web_view_set_loader_client): Use
webkitWebViewSetLoaderClient().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98240 => 98241)
--- trunk/Source/WebKit2/ChangeLog 2011-10-24 15:14:46 UTC (rev 98240)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-24 15:17:25 UTC (rev 98241)
@@ -1,5 +1,20 @@
2011-10-24 Carlos Garcia Campos <[email protected]>
+ [GTK] Add helper function to set the loader client in WebKitWebView
+ https://bugs.webkit.org/show_bug.cgi?id=70594
+
+ Reviewed by Martin Robinson.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewSetLoaderClient): Helper function to set the loader
+ client.
+ (webkitWebViewConstructed): Use webkitWebViewSetLoaderClient() to
+ avoid unnecessary checks.
+ (webkit_web_view_set_loader_client): Use
+ webkitWebViewSetLoaderClient().
+
+2011-10-24 Carlos Garcia Campos <[email protected]>
+
[GTK] Remove g_thread_init() calls
https://bugs.webkit.org/show_bug.cgi?id=70717
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98240 => 98241)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-24 15:14:46 UTC (rev 98240)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-24 15:17:25 UTC (rev 98241)
@@ -54,15 +54,27 @@
G_DEFINE_TYPE(WebKitWebView, webkit_web_view, WEBKIT_TYPE_WEB_VIEW_BASE)
+static void webkitWebViewSetLoaderClient(WebKitWebView* webView, WebKitWebLoaderClient* loaderClient, WKPageRef wkPage)
+{
+ webView->priv->loaderClient = loaderClient;
+ webkitWebLoaderClientAttachLoaderClientToPage(loaderClient, wkPage);
+}
+
static void webkitWebViewConstructed(GObject* object)
{
+ if (G_OBJECT_CLASS(webkit_web_view_parent_class)->constructed)
+ G_OBJECT_CLASS(webkit_web_view_parent_class)->constructed(object);
+
WebKitWebView* webView = WEBKIT_WEB_VIEW(object);
WebKitWebViewPrivate* priv = webView->priv;
+ WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);
- webkitWebViewBaseCreateWebPage(WEBKIT_WEB_VIEW_BASE(webView), webkitWebContextGetWKContext(priv->context), 0);
+ webkitWebViewBaseCreateWebPage(webViewBase, webkitWebContextGetWKContext(priv->context), 0);
+ WebPageProxy* page = webkitWebViewBaseGetPage(webViewBase);
+
static GRefPtr<WebKitWebLoaderClient> defaultLoaderClient = adoptGRef(WEBKIT_WEB_LOADER_CLIENT(g_object_new(WEBKIT_TYPE_WEB_LOADER_CLIENT, NULL)));
- webkit_web_view_set_loader_client(webView, defaultLoaderClient.get());
+ webkitWebViewSetLoaderClient(webView, defaultLoaderClient.get(), toAPI(page));
}
static void webkitWebViewSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -235,8 +247,7 @@
return;
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
- webkitWebLoaderClientAttachLoaderClientToPage(loaderClient, toAPI(page));
- priv->loaderClient = loaderClient;
+ webkitWebViewSetLoaderClient(webView, loaderClient, toAPI(page));
}
/**
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
