From 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Nov 2012 12:18:48 +0100 Subject: Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119) New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann --- Source/WebKit/gtk/webkit/webkitwebframe.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/WebKit/gtk/webkit/webkitwebframe.cpp') diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp index 80800c2c5..1e7c4c3f3 100644 --- a/Source/WebKit/gtk/webkit/webkitwebframe.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebframe.cpp @@ -33,6 +33,7 @@ #include "DocumentFragment.h" #include "DocumentLoader.h" #include "DocumentLoaderGtk.h" +#include "FrameLoadRequest.h" #include "FrameLoader.h" #include "FrameLoaderClientGtk.h" #include "FrameSelection.h" @@ -674,7 +675,7 @@ void webkit_web_frame_load_uri(WebKitWebFrame* frame, const gchar* uri) if (!coreFrame) return; - coreFrame->loader()->load(ResourceRequest(KURL(KURL(), String::fromUTF8(uri))), false); + coreFrame->loader()->load(FrameLoadRequest(coreFrame, ResourceRequest(KURL(KURL(), String::fromUTF8(uri))))); } static void webkit_web_frame_load_data(WebKitWebFrame* frame, const gchar* content, const gchar* mimeType, const gchar* encoding, const gchar* baseURL, const gchar* unreachableURL) @@ -693,7 +694,7 @@ static void webkit_web_frame_load_data(WebKitWebFrame* frame, const gchar* conte KURL(KURL(), String::fromUTF8(unreachableURL)), KURL(KURL(), String::fromUTF8(unreachableURL))); - coreFrame->loader()->load(request, substituteData, false); + coreFrame->loader()->load(FrameLoadRequest(coreFrame, request, substituteData)); } /** @@ -762,7 +763,7 @@ void webkit_web_frame_load_request(WebKitWebFrame* frame, WebKitNetworkRequest* if (!coreFrame) return; - coreFrame->loader()->load(core(request), false); + coreFrame->loader()->load(FrameLoadRequest(coreFrame->document()->securityOrigin(), core(request))); } /** -- cgit v1.2.1