Diff
Modified: trunk/Source/WebKit2/ChangeLog (97959 => 97960)
--- trunk/Source/WebKit2/ChangeLog 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-20 11:16:37 UTC (rev 97960)
@@ -1,3 +1,32 @@
+2011-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Remove WebKitWebLoaderClientPrivate
+ https://bugs.webkit.org/show_bug.cgi?id=70488
+
+ Reviewed by Philippe Normand.
+
+ It's unused since r97920.
+
+ * GNUmakefile.am: Add WebKitWebLoaderClientPrivate.h.
+ * UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+ (webkitWebLoaderClientAttachLoaderClientToPage): Renamed to make
+ it clear it's a private method of WebKitWebLoaderClient.
+ (webkit_web_loader_client_init): Remove
+ WebKitWebLoaderClientPrivate initialization.
+ (webkit_web_loader_client_class_init): Removed adding
+ WebKitWebLoaderClientPrivate struct as private data.
+ * UIProcess/API/gtk/WebKitWebLoaderClient.h: Remove
+ WebKitWebLoaderClientPrivate definition.
+ * UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h: Move
+ webkitWebLoaderClientAttachLoaderClientToPage method here since
+ it's a private method implemented in WebKitWebLoaderClient, not in
+ WebKitWebView.
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_set_loader_client): Use
+ webkitWebLoaderClientAttachLoaderClientToPage.
+ * UIProcess/API/gtk/WebKitWebViewPrivate.h: Remove
+ webkitWebLoaderClientAttachLoaderClientToPage prototype.
+
2011-10-10 Martin Robinson <mrobin...@igalia.com>
[GTK] [WebKit2] Allow sharing page clients between WebViews
Modified: trunk/Source/WebKit2/GNUmakefile.am (97959 => 97960)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-10-20 11:16:37 UTC (rev 97960)
@@ -485,6 +485,7 @@
Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp \
+ Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (97959 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp 2011-10-20 11:16:37 UTC (rev 97960)
@@ -23,6 +23,7 @@
#include "WebKitError.h"
#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
+#include "WebKitWebLoaderClientPrivate.h"
#include "WebKitWebView.h"
#include "WebKitWebViewPrivate.h"
#include "WebKitWebViewBasePrivate.h"
@@ -44,10 +45,6 @@
LAST_SIGNAL
};
-struct _WebKitWebLoaderClientPrivate {
- GRefPtr<WebKitWebView> view;
-};
-
static guint signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE(WebKitWebLoaderClient, webkit_web_loader_client, G_TYPE_OBJECT)
@@ -128,11 +125,11 @@
webkitWebViewSetEstimatedLoadProgress(webView, WKPageGetEstimatedProgress(page));
}
-void attachLoaderClientToPage(WKPageRef page, WebKitWebLoaderClient* client)
+void webkitWebLoaderClientAttachLoaderClientToPage(WebKitWebLoaderClient* loaderClient, WKPageRef wkPage)
{
- WKPageLoaderClient loaderClient = {
+ WKPageLoaderClient wkLoaderClient = {
kWKPageLoaderClientCurrentVersion,
- client, // clientInfo
+ loaderClient, // clientInfo
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
didFailProvisionalLoadWithErrorForFrame,
@@ -159,7 +156,7 @@
0, // shouldGoToBackForwardListItem
0 // didFailToInitializePlugin
};
- WKPageSetPageLoaderClient(page, &loaderClient);
+ WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
}
static gboolean webkitWebLoaderClientLoadFailed(WebKitWebLoaderClient* client, WebKitWebView* webView, const gchar* failingURI, GError* error)
@@ -175,23 +172,13 @@
return TRUE;
}
-static void webkitWebLoaderClientFinalize(GObject* object)
-{
- WEBKIT_WEB_LOADER_CLIENT(object)->priv->~WebKitWebLoaderClientPrivate();
- G_OBJECT_CLASS(webkit_web_loader_client_parent_class)->finalize(object);
-}
-
static void webkit_web_loader_client_init(WebKitWebLoaderClient* client)
{
- WebKitWebLoaderClientPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(client, WEBKIT_TYPE_WEB_LOADER_CLIENT, WebKitWebLoaderClientPrivate);
- client->priv = priv;
- new (priv) WebKitWebLoaderClientPrivate();
}
static void webkit_web_loader_client_class_init(WebKitWebLoaderClientClass* clientClass)
{
GObjectClass* objectClass = G_OBJECT_CLASS(clientClass);
- objectClass->finalize = webkitWebLoaderClientFinalize;
clientClass->provisional_load_failed = webkitWebLoaderClientLoadFailed;
clientClass->load_failed = webkitWebLoaderClientLoadFailed;
@@ -347,6 +334,4 @@
WEBKIT_TYPE_WEB_VIEW,
G_TYPE_STRING,
G_TYPE_POINTER);
-
- g_type_class_add_private(clientClass, sizeof(WebKitWebLoaderClientPrivate));
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h (97959 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-10-20 11:16:37 UTC (rev 97960)
@@ -36,12 +36,8 @@
#define WEBKIT_IS_WEB_LOADER_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_LOADER_CLIENT))
#define WEBKIT_WEB_LOADER_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_LOADER_CLIENT, WebKitWebLoaderClientClass))
-typedef struct _WebKitWebLoaderClientPrivate WebKitWebLoaderClientPrivate;
-
struct _WebKitWebLoaderClient {
GObject parent;
-
- WebKitWebLoaderClientPrivate *priv;
};
struct _WebKitWebLoaderClientClass {
@@ -67,7 +63,7 @@
};
WEBKIT_API GType
-webkit_web_loader_client_get_type (void);
+webkit_web_loader_client_get_type (void);
G_END_DECLS
Copied: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h (from rev 97959, trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h) (0 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClientPrivate.h 2011-10-20 11:16:37 UTC (rev 97960)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebKitWebLoaderClientPrivate_h
+#define WebKitWebLoaderClientPrivate_h
+
+#include "WebKitWebLoaderClient.h"
+#include <WebKit2/WebKit2.h>
+
+void webkitWebLoaderClientAttachLoaderClientToPage(WebKitWebLoaderClient*, WKPageRef);
+
+#endif // WebKitWebLoaderClientPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (97959 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-20 11:16:37 UTC (rev 97960)
@@ -22,6 +22,7 @@
#include "WebKitWebContextPrivate.h"
#include "WebKitWebLoaderClient.h"
+#include "WebKitWebLoaderClientPrivate.h"
#include "WebKitWebViewBasePrivate.h"
#include "WebKitWebViewPrivate.h"
#include "WebKitPrivate.h"
@@ -234,7 +235,7 @@
return;
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
- attachLoaderClientToPage(toAPI(page), loaderClient);
+ webkitWebLoaderClientAttachLoaderClientToPage(loaderClient, toAPI(page));
priv->loaderClient = loaderClient;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h (97959 => 97960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2011-10-20 11:03:02 UTC (rev 97959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2011-10-20 11:16:37 UTC (rev 97960)
@@ -31,6 +31,4 @@
void webkitWebViewSetEstimatedLoadProgress(WebKitWebView*, double estimatedLoadProgress);
-void attachLoaderClientToPage(WKPageRef, WebKitWebLoaderClient*);
-
#endif // WebKitWebViewPrivate_h
