Diff
Modified: trunk/Source/WebKit2/ChangeLog (101247 => 101248)
--- trunk/Source/WebKit2/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-28 12:26:25 UTC (rev 101248)
@@ -1,3 +1,34 @@
+2011-11-28 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Rename WebKitNetworkRequest to WebKitURIRequest
+ https://bugs.webkit.org/show_bug.cgi?id=73202
+
+ Reviewed by Martin Robinson.
+
+ Network is confusing because the request can be for a local file uri.
+
+ * GNUmakefile.am:
+ * UIProcess/API/gtk/WebKitNetworkRequest.h: Removed.
+ * UIProcess/API/gtk/WebKitURIRequest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp.
+ (webkitURIRequestFinalize):
+ (webkitURIRequestGetProperty):
+ (webkitURIRequestSetProperty):
+ (webkit_uri_request_class_init):
+ (webkit_uri_request_init):
+ (webkit_uri_request_new):
+ (webkit_uri_request_get_uri):
+ * UIProcess/API/gtk/WebKitURIRequest.h: Added.
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_load_request):
+ * UIProcess/API/gtk/WebKitWebView.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+ * UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
+ (testLoadRequest):
+ * UIProcess/API/gtk/tests/WebViewTest.cpp:
+ (WebViewTest::loadRequest):
+ * UIProcess/API/gtk/tests/WebViewTest.h:
+ * UIProcess/API/gtk/webkit2.h:
+
2011-11-28 Simon Hausmann <[email protected]>
[Qt] WTF should be built as separate static library
Modified: trunk/Source/WebKit2/GNUmakefile.am (101247 => 101248)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-28 12:26:25 UTC (rev 101248)
@@ -79,10 +79,10 @@
$(WebKit2)/UIProcess/API/gtk/WebKitBackForwardListItem.h \
$(WebKit2)/UIProcess/API/gtk/WebKitDefines.h \
$(WebKit2)/UIProcess/API/gtk/WebKitError.h \
- $(WebKit2)/UIProcess/API/gtk/WebKitNetworkRequest.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebLoaderClient.h \
$(WebKit2)/UIProcess/API/gtk/WebKitSettings.h \
+ $(WebKit2)/UIProcess/API/gtk/WebKitURIRequest.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
$(WebKit2)/UIProcess/API/gtk/webkit2.h
@@ -502,12 +502,12 @@
Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h \
Source/WebKit2/UIProcess/API/gtk/WebKitError.h \
Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp \
- Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp \
- Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h \
Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h \
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h \
Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h \
+ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp \
+ Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h \
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp 2011-11-28 12:26:25 UTC (rev 101248)
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebKitNetworkRequest.h"
-
-#include "WebKitPrivate.h"
-#include "WebURLRequest.h"
-#include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/CString.h>
-
-enum {
- PROP_0,
-
- PROP_URI
-};
-
-using namespace WebCore;
-
-G_DEFINE_TYPE(WebKitNetworkRequest, webkit_network_request, G_TYPE_OBJECT)
-
-struct _WebKitNetworkRequestPrivate {
- CString uri;
-};
-
-static void webkitNetworkRequestFinalize(GObject* object)
-{
- WEBKIT_NETWORK_REQUEST(object)->priv->~WebKitNetworkRequestPrivate();
- G_OBJECT_CLASS(webkit_network_request_parent_class)->finalize(object);
-}
-
-static void webkitNetworkRequestGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
-{
- WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(object);
-
- switch (propId) {
- case PROP_URI:
- g_value_set_string(value, webkit_network_request_get_uri(request));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
- }
-}
-
-static void webkitNetworkRequestSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
-{
- WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(object);
-
- switch (propId) {
- case PROP_URI:
- request->priv->uri = g_value_get_string(value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
- }
-}
-
-static void webkit_network_request_class_init(WebKitNetworkRequestClass* requestClass)
-{
- GObjectClass* objectClass = G_OBJECT_CLASS(requestClass);
-
- objectClass->finalize = webkitNetworkRequestFinalize;
- objectClass->get_property = webkitNetworkRequestGetProperty;
- objectClass->set_property = webkitNetworkRequestSetProperty;
-
- /**
- * WebKitNetworkRequest:uri:
- *
- * The URI to which the request will be made.
- */
- g_object_class_install_property(objectClass, PROP_URI,
- g_param_spec_string("uri",
- _("URI"),
- _("The URI to which the request will be made."),
- 0,
- static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
-
- g_type_class_add_private(requestClass, sizeof(WebKitNetworkRequestPrivate));
-}
-
-static void webkit_network_request_init(WebKitNetworkRequest* request)
-{
- WebKitNetworkRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate);
- request->priv = priv;
- new (priv) WebKitNetworkRequestPrivate();
-}
-
-/**
- * webkit_network_request_new:
- * @uri: an URI
- *
- * Creates a new #WebKitNetworkRequest for the given URI.
- *
- * Returns: a new #WebKitNetworkRequest
- */
-WebKitNetworkRequest* webkit_network_request_new(const gchar* uri)
-{
- g_return_val_if_fail(uri, 0);
-
- return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "uri", uri, NULL));
-}
-
-/**
- * webkit_network_request_get_uri:
- * @request: a #WebKitNetworkRequest
- *
- * Returns: the uri of the #WebKitNetworkRequest
- */
-const gchar* webkit_network_request_get_uri(WebKitNetworkRequest* request)
-{
- g_return_val_if_fail(WEBKIT_IS_NETWORK_REQUEST(request), 0);
-
- return request->priv->uri.data();
-}
-
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.h 2011-11-28 12:26:25 UTC (rev 101248)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
-#error "Only <webkit2/webkit2.h> can be included directly."
-#endif
-
-#ifndef WebKitNetworkRequest_h
-#define WebKitNetworkRequest_h
-
-#include <glib-object.h>
-#include <webkit2/WebKitDefines.h>
-
-G_BEGIN_DECLS
-
-#define WEBKIT_TYPE_NETWORK_REQUEST (webkit_network_request_get_type())
-#define WEBKIT_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequest))
-#define WEBKIT_IS_NETWORK_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_NETWORK_REQUEST))
-#define WEBKIT_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
-#define WEBKIT_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_NETWORK_REQUEST))
-#define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
-
-typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
-typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
-typedef struct _WebKitNetworkRequestPrivate WebKitNetworkRequestPrivate;
-
-struct _WebKitNetworkRequest {
- GObject parent;
-
- /*< private >*/
- WebKitNetworkRequestPrivate *priv;
-};
-
-struct _WebKitNetworkRequestClass {
- GObjectClass parent_class;
-
-};
-
-WEBKIT_API GType
-webkit_network_request_get_type (void);
-
-WEBKIT_API WebKitNetworkRequest *
-webkit_network_request_new (const gchar *uri);
-
-WEBKIT_API const gchar *
-webkit_network_request_get_uri (WebKitNetworkRequest *request);
-
-G_END_DECLS
-
-#endif
Copied: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp (from rev 101247, trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkRequest.cpp) (0 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp 2011-11-28 12:26:25 UTC (rev 101248)
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "WebKitURIRequest.h"
+
+#include "WebKitPrivate.h"
+#include "WebURLRequest.h"
+#include <glib/gi18n-lib.h>
+#include <wtf/gobject/GRefPtr.h>
+#include <wtf/text/CString.h>
+
+enum {
+ PROP_0,
+
+ PROP_URI
+};
+
+using namespace WebCore;
+
+G_DEFINE_TYPE(WebKitURIRequest, webkit_uri_request, G_TYPE_OBJECT)
+
+struct _WebKitURIRequestPrivate {
+ CString uri;
+};
+
+static void webkitURIRequestFinalize(GObject* object)
+{
+ WEBKIT_URI_REQUEST(object)->priv->~WebKitURIRequestPrivate();
+ G_OBJECT_CLASS(webkit_uri_request_parent_class)->finalize(object);
+}
+
+static void webkitURIRequestGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
+{
+ WebKitURIRequest* request = WEBKIT_URI_REQUEST(object);
+
+ switch (propId) {
+ case PROP_URI:
+ g_value_set_string(value, webkit_uri_request_get_uri(request));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
+ }
+}
+
+static void webkitURIRequestSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
+{
+ WebKitURIRequest* request = WEBKIT_URI_REQUEST(object);
+
+ switch (propId) {
+ case PROP_URI:
+ request->priv->uri = g_value_get_string(value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
+ }
+}
+
+static void webkit_uri_request_class_init(WebKitURIRequestClass* requestClass)
+{
+ GObjectClass* objectClass = G_OBJECT_CLASS(requestClass);
+
+ objectClass->finalize = webkitURIRequestFinalize;
+ objectClass->get_property = webkitURIRequestGetProperty;
+ objectClass->set_property = webkitURIRequestSetProperty;
+
+ /**
+ * WebKitURIRequest:uri:
+ *
+ * The URI to which the request will be made.
+ */
+ g_object_class_install_property(objectClass, PROP_URI,
+ g_param_spec_string("uri",
+ _("URI"),
+ _("The URI to which the request will be made."),
+ 0,
+ static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
+ g_type_class_add_private(requestClass, sizeof(WebKitURIRequestPrivate));
+}
+
+static void webkit_uri_request_init(WebKitURIRequest* request)
+{
+ WebKitURIRequestPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(request, WEBKIT_TYPE_URI_REQUEST, WebKitURIRequestPrivate);
+ request->priv = priv;
+ new (priv) WebKitURIRequestPrivate();
+}
+
+/**
+ * webkit_uri_request_new:
+ * @uri: an URI
+ *
+ * Creates a new #WebKitURIRequest for the given URI.
+ *
+ * Returns: a new #WebKitURIRequest
+ */
+WebKitURIRequest* webkit_uri_request_new(const gchar* uri)
+{
+ g_return_val_if_fail(uri, 0);
+
+ return WEBKIT_URI_REQUEST(g_object_new(WEBKIT_TYPE_URI_REQUEST, "uri", uri, NULL));
+}
+
+/**
+ * webkit_uri_request_get_uri:
+ * @request: a #WebKitURIRequest
+ *
+ * Returns: the uri of the #WebKitURIRequest
+ */
+const gchar* webkit_uri_request_get_uri(WebKitURIRequest* request)
+{
+ g_return_val_if_fail(WEBKIT_IS_URI_REQUEST(request), 0);
+
+ return request->priv->uri.data();
+}
+
Added: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h (0 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.h 2011-11-28 12:26:25 UTC (rev 101248)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
+#ifndef WebKitURIRequest_h
+#define WebKitURIRequest_h
+
+#include <glib-object.h>
+#include <webkit2/WebKitDefines.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_URI_REQUEST (webkit_uri_request_get_type())
+#define WEBKIT_URI_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_URI_REQUEST, WebKitURIRequest))
+#define WEBKIT_IS_URI_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_URI_REQUEST))
+#define WEBKIT_URI_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_URI_REQUEST, WebKitURIRequestClass))
+#define WEBKIT_IS_URI_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_URI_REQUEST))
+#define WEBKIT_URI_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_URI_REQUEST, WebKitURIRequestClass))
+
+typedef struct _WebKitURIRequest WebKitURIRequest;
+typedef struct _WebKitURIRequestClass WebKitURIRequestClass;
+typedef struct _WebKitURIRequestPrivate WebKitURIRequestPrivate;
+
+struct _WebKitURIRequest {
+ GObject parent;
+
+ /*< private >*/
+ WebKitURIRequestPrivate *priv;
+};
+
+struct _WebKitURIRequestClass {
+ GObjectClass parent_class;
+
+};
+
+WEBKIT_API GType
+webkit_uri_request_get_type (void);
+
+WEBKIT_API WebKitURIRequest *
+webkit_uri_request_new (const gchar *uri);
+
+WEBKIT_API const gchar *
+webkit_uri_request_get_uri (WebKitURIRequest *request);
+
+G_END_DECLS
+
+#endif
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-11-28 12:26:25 UTC (rev 101248)
@@ -418,18 +418,18 @@
/**
* webkit_web_view_load_request:
* @web_view: a #WebKitWebView
- * @request: a #WebKitNetworkRequest to load
+ * @request: a #WebKitURIRequest to load
*
- * Requests loading of the specified #WebKitNetworkRequest.
+ * Requests loading of the specified #WebKitURIRequest.
* You can monitor the status of the load operation using the
* #WebKitWebLoaderClient of @web_view. See webkit_web_view_get_loader_client().
*/
-void webkit_web_view_load_request(WebKitWebView* webView, WebKitNetworkRequest* request)
+void webkit_web_view_load_request(WebKitWebView* webView, WebKitURIRequest* request)
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- g_return_if_fail(WEBKIT_IS_NETWORK_REQUEST(request));
+ g_return_if_fail(WEBKIT_IS_URI_REQUEST(request));
- WKRetainPtr<WKURLRef> wkURL(AdoptWK, WKURLCreateWithUTF8CString(webkit_network_request_get_uri(request)));
+ WKRetainPtr<WKURLRef> wkURL(AdoptWK, WKURLCreateWithUTF8CString(webkit_uri_request_get_uri(request)));
WKRetainPtr<WKURLRequestRef> wkRequest(AdoptWK, WKURLRequestCreateWithWKURL(wkURL.get()));
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKPageLoadURLRequest(toAPI(page), wkRequest.get());
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-11-28 12:26:25 UTC (rev 101248)
@@ -30,10 +30,10 @@
#include <webkit2/WebKitBackForwardList.h>
#include <webkit2/WebKitDefines.h>
-#include <webkit2/WebKitNetworkRequest.h>
#include <webkit2/WebKitWebContext.h>
#include <webkit2/WebKitWebLoaderClient.h>
#include <webkit2/WebKitSettings.h>
+#include <webkit2/WebKitURIRequest.h>
#include <webkit2/WebKitWebViewBase.h>
G_BEGIN_DECLS
@@ -107,7 +107,7 @@
const gchar *unreachable_uri);
WEBKIT_API void
webkit_web_view_load_request (WebKitWebView *web_view,
- WebKitNetworkRequest *request);
+ WebKitURIRequest *request);
WEBKIT_API void
webkit_web_view_stop_loading (WebKitWebView *web_view);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2011-11-28 12:26:25 UTC (rev 101248)
@@ -230,23 +230,23 @@
</SECTION>
<SECTION>
-<FILE>WebKitNetworkRequest</FILE>
-WebKitNetworkRequest
-webkit_network_request_new
-webkit_network_request_get_uri
+<FILE>WebKitURIRequest</FILE>
+WebKitURIRequest
+webkit_uri_request_new
+webkit_uri_request_get_uri
<SUBSECTION Standard>
-WebKitNetworkRequestClass
-WEBKIT_TYPE_NETWORK_REQUEST
-WEBKIT_NETWORK_REQUEST
-WEBKIT_IS_NETWORK_REQUEST
-WEBKIT_NETWORK_REQUEST_CLASS
-WEBKIT_IS_NETWORK_REQUEST_CLASS
-WEBKIT_NETWORK_REQUEST_GET_CLASS
+WebKitURIRequestClass
+WEBKIT_TYPE_URI_REQUEST
+WEBKIT_URI_REQUEST
+WEBKIT_IS_URI_REQUEST
+WEBKIT_URI_REQUEST_CLASS
+WEBKIT_IS_URI_REQUEST_CLASS
+WEBKIT_URI_REQUEST_GET_CLASS
<SUBSECTION Private>
-WebKitNetworkRequestPrivate
-webkit_network_request_get_type
+WebKitURIRequestPrivate
+webkit_uri_request_get_type
</SECTION>
<SECTION>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2011-11-28 12:26:25 UTC (rev 101248)
@@ -86,7 +86,7 @@
static void testLoadRequest(LoadTrackingTest* test, gconstpointer)
{
- GRefPtr<WebKitNetworkRequest> request(webkit_network_request_new(kServer->getURIForPath("/normal").data()));
+ GRefPtr<WebKitURIRequest> request(webkit_uri_request_new(kServer->getURIForPath("/normal").data()));
test->loadRequest(request.get());
test->waitUntilLoadFinished();
assertNormalLoadHappenedAndClearEvents(test->m_loadEvents);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2011-11-28 12:26:25 UTC (rev 101248)
@@ -64,9 +64,9 @@
webkit_web_view_load_alternate_html(m_webView, html, baseURI, unreachableURI);
}
-void WebViewTest::loadRequest(WebKitNetworkRequest* request)
+void WebViewTest::loadRequest(WebKitURIRequest* request)
{
- m_activeURI = webkit_network_request_get_uri(request);
+ m_activeURI = webkit_uri_request_get_uri(request);
webkit_web_view_load_request(m_webView, request);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h 2011-11-28 12:26:25 UTC (rev 101248)
@@ -35,7 +35,7 @@
void loadHtml(const char* html, const char* baseURI);
void loadPlainText(const char* plainText);
void loadAlternateHTML(const char* html, const char* baseURI, const char* unreachableURI);
- void loadRequest(WebKitNetworkRequest*);
+ void loadRequest(WebKitURIRequest*);
void goBack();
void goForward();
void goToBackForwardListItem(WebKitBackForwardListItem*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h (101247 => 101248)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2011-11-28 12:20:45 UTC (rev 101247)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2011-11-28 12:26:25 UTC (rev 101248)
@@ -28,8 +28,8 @@
#include <webkit2/WebKitDefines.h>
#include <webkit2/WebKitEnumTypes.h>
#include <webkit2/WebKitError.h>
-#include <webkit2/WebKitNetworkRequest.h>
#include <webkit2/WebKitSettings.h>
+#include <webkit2/WebKitURIRequest.h>
#include <webkit2/WebKitWebContext.h>
#include <webkit2/WebKitWebLoaderClient.h>
#include <webkit2/WebKitWebViewBase.h>
