Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-03 13:43:36 UTC (rev 163301)
@@ -1,3 +1,45 @@
+2014-01-29 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix the GTK+ build after r163037.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_load_uri):
+ (webkit_web_view_load_request):
+
+2014-01-29 Anders Carlsson <ander...@apple.com>
+
+ Consolidate page loading functions
+ https://bugs.webkit.org/show_bug.cgi?id=127847
+
+ Reviewed by Tim Horton.
+
+ Get rid of the loadURL functions (and the LoadURL message), rename
+ loadURLRequest to loadRequest and change it to take a ResourceRequest instead
+ of an API::URLRequest.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageLoadURL):
+ (WKPageLoadURLWithUserData):
+ (WKPageLoadURLRequest):
+ (WKPageLoadURLRequestWithUserData):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController loadRequest:userData:]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView loadRequest:]):
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::decidePolicyForNavigationAction):
+ (WebKit::WebInspectorProxy::createInspectorPage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadRequest):
+ (WebKit::WebPageProxy::loadFile):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/cf/WebPageProxyCF.cpp:
+ (WebKit::WebPageProxy::restoreFromSessionStateData):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadRequest):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2014-01-29 Csaba Osztrogonác <o...@webkit.org>
Remove ENABLE(_javascript__DEBUGGER) guards
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -82,22 +82,22 @@
void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef)
{
- toImpl(pageRef)->loadURL(toWTFString(URLRef));
+ toImpl(pageRef)->loadRequest(toWTFString(URLRef));
}
void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef)
{
- toImpl(pageRef)->loadURL(toWTFString(URLRef), toImpl(userDataRef));
+ toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), toImpl(userDataRef));
}
void WKPageLoadURLRequest(WKPageRef pageRef, WKURLRequestRef urlRequestRef)
{
- toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef));
+ toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest());
}
void WKPageLoadURLRequestWithUserData(WKPageRef pageRef, WKURLRequestRef urlRequestRef, WKTypeRef userDataRef)
{
- toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef), toImpl(userDataRef));
+ toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest(), toImpl(userDataRef));
}
void WKPageLoadFile(WKPageRef pageRef, WKURLRef fileURL, WKURLRef resourceDirectoryURL)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-02-03 13:43:36 UTC (rev 163301)
@@ -187,13 +187,11 @@
- (void)loadRequest:(NSURLRequest *)request userData:(id)userData
{
- RefPtr<API::URLRequest> wkURLRequest = API::URLRequest::create(request);
-
RefPtr<ObjCObjectGraph> wkUserData;
if (userData)
wkUserData = ObjCObjectGraph::create(userData);
- _page->loadURLRequest(wkURLRequest.get(), wkUserData.get());
+ _page->loadRequest(request, wkUserData.get());
}
- (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-03 13:43:36 UTC (rev 163301)
@@ -109,7 +109,7 @@
- (void)loadRequest:(NSURLRequest *)request
{
- _page->loadURLRequest(API::URLRequest::create(request).get());
+ _page->loadRequest(request);
}
#pragma mark iOS-specific methods
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -1945,7 +1945,7 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(uri);
- getPage(webView)->loadURL(String::fromUTF8(uri));
+ getPage(webView)->loadRequest(String::fromUTF8(uri));
}
/**
@@ -2027,8 +2027,7 @@
ResourceRequest resourceRequest;
webkitURIRequestGetResourceRequest(request, resourceRequest);
- RefPtr<API::URLRequest> urlRequest = API::URLRequest::create(resourceRequest);
- getPage(webView)->loadURLRequest(urlRequest.get());
+ getPage(webView)->loadRequest(resourceRequest);
}
/**
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -394,7 +394,7 @@
toImpl(listenerRef)->ignore();
// And instead load it in the inspected page.
- webInspectorProxy->page()->loadURLRequest(toImpl(requestRef));
+ webInspectorProxy->page()->loadRequest(toImpl(requestRef)->resourceRequest());
}
#if ENABLE(INSPECTOR_SERVER)
@@ -471,7 +471,7 @@
m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL());
- inspectorPage->loadURL(url);
+ inspectorPage->loadRequest(URL(URL(), url));
m_createdInspectorPage = true;
}
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -607,40 +607,23 @@
return true;
}
-void WebPageProxy::loadURL(const String& url, API::Object* userData)
+void WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData)
{
auto transaction = m_pageLoadState.transaction();
- m_pageLoadState.setPendingAPIRequestURL(transaction, url);
+ m_pageLoadState.setPendingAPIRequestURL(transaction, request.url());
if (!isValid())
reattachToWebProcess();
SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(URL(URL(), url), sandboxExtensionHandle);
+ bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle);
if (createdExtension)
m_process->willAcquireUniversalFileReadSandboxExtension();
- m_process->send(Messages::WebPage::LoadURL(url, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
+ m_process->send(Messages::WebPage::LoadRequest(request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
m_process->responsivenessTimer()->start();
}
-void WebPageProxy::loadURLRequest(API::URLRequest* urlRequest, API::Object* userData)
-{
- auto transaction = m_pageLoadState.transaction();
-
- m_pageLoadState.setPendingAPIRequestURL(transaction, urlRequest->resourceRequest().url());
-
- if (!isValid())
- reattachToWebProcess();
-
- SandboxExtension::Handle sandboxExtensionHandle;
- bool createdExtension = maybeInitializeSandboxExtensionHandle(urlRequest->resourceRequest().url(), sandboxExtensionHandle);
- if (createdExtension)
- m_process->willAcquireUniversalFileReadSandboxExtension();
- m_process->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest(), sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
- m_process->responsivenessTimer()->start();
-}
-
void WebPageProxy::loadFile(const String& fileURLString, const String& resourceDirectoryURLString, API::Object* userData)
{
if (!isValid())
@@ -664,7 +647,7 @@
SandboxExtension::Handle sandboxExtensionHandle;
SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle);
m_process->assumeReadAccessToBaseURL(resourceDirectoryURL);
- m_process->send(Messages::WebPage::LoadURL(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
+ m_process->send(Messages::WebPage::LoadRequest(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
m_process->responsivenessTimer()->start();
}
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-03 13:43:36 UTC (rev 163301)
@@ -380,8 +380,7 @@
bool tryClose();
bool isClosed() const { return m_isClosed; }
- void loadURL(const String&, API::Object* userData = nullptr);
- void loadURLRequest(API::URLRequest*, API::Object* userData = nullptr);
+ void loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr);
void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
void loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -176,7 +176,7 @@
}
if (provisionalURL)
- loadURL(provisionalURL);
+ loadRequest(URL(URL(), provisionalURL));
}
static RetainPtr<CFStringRef> autosaveKey(const String& name)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 13:43:36 UTC (rev 163301)
@@ -891,11 +891,6 @@
send(Messages::WebPageProxy::ClosePage(false));
}
-void WebPage::loadURL(const String& url, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
-{
- loadURLRequest(ResourceRequest(URL(URL(), url)), sandboxExtensionHandle, decoder);
-}
-
void WebPage::loadURLInFrame(const String& url, uint64_t frameID)
{
WebFrame* frame = WebProcess::shared().webFrame(frameID);
@@ -905,7 +900,7 @@
frame->coreFrame()->loader().load(FrameLoadRequest(frame->coreFrame(), ResourceRequest(URL(URL(), url))));
}
-void WebPage::loadURLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
+void WebPage::loadRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
{
SendStopResponsivenessTimer stopper(this);
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-03 13:43:36 UTC (rev 163301)
@@ -723,8 +723,7 @@
// Actions
void tryClose();
- void loadURL(const String&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
- void loadURLRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
+ void loadRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, IPC::MessageDecoder&);
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (163300 => 163301)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-03 12:13:30 UTC (rev 163300)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-02-03 13:43:36 UTC (rev 163301)
@@ -81,9 +81,8 @@
GoToBackForwardItem(uint64_t backForwardItemID)
TryRestoreScrollPosition()
- LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadURLInFrame(String url, uint64_t frameID)
- LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
+ LoadRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
