From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Feb 2012 09:55:33 +0100 Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560) --- Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp index 154532a83..b5c2b4e74 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp @@ -21,9 +21,8 @@ #include "WebKitURIRequest.h" #include "WebKitPrivate.h" -#include "WebURLRequest.h" +#include "WebKitURIRequestPrivate.h" #include -#include #include enum { @@ -37,6 +36,7 @@ using namespace WebCore; G_DEFINE_TYPE(WebKitURIRequest, webkit_uri_request, G_TYPE_OBJECT) struct _WebKitURIRequestPrivate { + WebCore::ResourceRequest resourceRequest; CString uri; }; @@ -65,7 +65,7 @@ static void webkitURIRequestSetProperty(GObject* object, guint propId, const GVa switch (propId) { case PROP_URI: - request->priv->uri = g_value_get_string(value); + request->priv->resourceRequest.setURL(KURL(KURL(), g_value_get_string(value))); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec); @@ -117,6 +117,13 @@ WebKitURIRequest* webkit_uri_request_new(const gchar* uri) return WEBKIT_URI_REQUEST(g_object_new(WEBKIT_TYPE_URI_REQUEST, "uri", uri, NULL)); } +WebKitURIRequest* webkitURIRequestCreateForResourceRequest(const WebCore::ResourceRequest& resourceRequest) +{ + WebKitURIRequest* uriRequest = WEBKIT_URI_REQUEST(g_object_new(WEBKIT_TYPE_URI_REQUEST, NULL)); + uriRequest->priv->resourceRequest = resourceRequest; + return uriRequest; +} + /** * webkit_uri_request_get_uri: * @request: a #WebKitURIRequest @@ -127,6 +134,7 @@ const gchar* webkit_uri_request_get_uri(WebKitURIRequest* request) { g_return_val_if_fail(WEBKIT_IS_URI_REQUEST(request), 0); + request->priv->uri = request->priv->resourceRequest.url().string().utf8(); return request->priv->uri.data(); } -- cgit v1.2.1