From f8a211c9157078b564e0b10ebcf02a9d6a829c60 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 3 Feb 2014 13:43:36 +0000 Subject: [PATCH] Merge r163037 - 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/API/gtk/WebKitWebView.cpp: (webkit_web_view_load_uri): (webkit_web_view_load_request): * 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: --- Source/WebKit2/ChangeLog | 42 +++++++++++++++++++ Source/WebKit2/UIProcess/API/C/WKPage.cpp | 8 ++-- .../API/Cocoa/WKBrowsingContextController.mm | 4 +- .../WebKit2/UIProcess/API/Cocoa/WKWebView.mm | 2 +- .../UIProcess/API/gtk/WebKitWebView.cpp | 5 +-- .../WebKit2/UIProcess/WebInspectorProxy.cpp | 4 +- Source/WebKit2/UIProcess/WebPageProxy.cpp | 27 +++--------- Source/WebKit2/UIProcess/WebPageProxy.h | 3 +- .../WebKit2/UIProcess/cf/WebPageProxyCF.cpp | 2 +- Source/WebKit2/WebProcess/WebPage/WebPage.cpp | 7 +--- Source/WebKit2/WebProcess/WebPage/WebPage.h | 3 +- .../WebProcess/WebPage/WebPage.messages.in | 3 +- 12 files changed, 62 insertions(+), 48 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 961083250d9e..874de06a1cd9 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,45 @@ +2014-01-29 Carlos Garcia Campos + + 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 + + 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 Remove ENABLE(JAVASCRIPT_DEBUGGER) guards diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp index af65a4a90162..c398b7060fc8 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp @@ -82,22 +82,22 @@ WKPageGroupRef WKPageGetPageGroup(WKPageRef pageRef) 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) diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm index 8d037effeb02..6433ad06fcac 100644 --- a/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm +++ b/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm @@ -187,13 +187,11 @@ - (void)loadRequest:(NSURLRequest *)request - (void)loadRequest:(NSURLRequest *)request userData:(id)userData { - RefPtr wkURLRequest = API::URLRequest::create(request); - RefPtr 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 diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm index 469704a6ef5e..3254dc8bdf03 100644 --- a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm +++ b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm @@ -109,7 +109,7 @@ - (WKWebViewConfiguration *)configuration - (void)loadRequest:(NSURLRequest *)request { - _page->loadURLRequest(API::URLRequest::create(request).get()); + _page->loadRequest(request); } #pragma mark iOS-specific methods diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp index 64ece59fe76c..53a19e3d4259 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp @@ -1945,7 +1945,7 @@ void webkit_web_view_load_uri(WebKitWebView* webView, const gchar* uri) 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 @@ void webkit_web_view_load_request(WebKitWebView* webView, WebKitURIRequest* requ ResourceRequest resourceRequest; webkitURIRequestGetResourceRequest(request, resourceRequest); - RefPtr urlRequest = API::URLRequest::create(resourceRequest); - getPage(webView)->loadURLRequest(urlRequest.get()); + getPage(webView)->loadRequest(resourceRequest); } /** diff --git a/Source/WebKit2/UIProcess/WebInspectorProxy.cpp b/Source/WebKit2/UIProcess/WebInspectorProxy.cpp index a60d9b13cbe4..2d2297f8cedb 100644 --- a/Source/WebKit2/UIProcess/WebInspectorProxy.cpp +++ b/Source/WebKit2/UIProcess/WebInspectorProxy.cpp @@ -394,7 +394,7 @@ static void decidePolicyForNavigationAction(WKPageRef, WKFrameRef frameRef, WKFr 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 @@ void WebInspectorProxy::createInspectorPage(uint64_t& inspectorPageID, WebPageCr m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL()); - inspectorPage->loadURL(url); + inspectorPage->loadRequest(URL(URL(), url)); m_createdInspectorPage = true; } diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp index a3de999cb71d..a804a1535b3c 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp @@ -607,37 +607,20 @@ bool WebPageProxy::maybeInitializeSandboxExtensionHandle(const URL& url, Sandbox 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->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->send(Messages::WebPage::LoadRequest(request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID); m_process->responsivenessTimer()->start(); } @@ -664,7 +647,7 @@ void WebPageProxy::loadFile(const String& fileURLString, const String& resourceD 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(); } diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h index 399efa24f75c..02cc3bd7bb9e 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.h +++ b/Source/WebKit2/UIProcess/WebPageProxy.h @@ -380,8 +380,7 @@ class WebPageProxy : public API::ObjectImpl 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); diff --git a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp index fc81c3f2ed1e..c19135ad6b64 100644 --- a/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp +++ b/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp @@ -176,7 +176,7 @@ void WebPageProxy::restoreFromSessionStateData(API::Data* apiData) } if (provisionalURL) - loadURL(provisionalURL); + loadRequest(URL(URL(), provisionalURL)); } static RetainPtr autosaveKey(const String& name) diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index d9b6f69501a7..8d7eca4dbaa1 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -891,11 +891,6 @@ void WebPage::sendClose() 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 @@ void WebPage::loadURLInFrame(const String& url, uint64_t frameID) 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); diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h index 611e88aef2c6..a983359f5da3 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h @@ -723,8 +723,7 @@ class WebPage : public API::ObjectImpl, public IP // 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&); diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in index 7be8fdca5bf4..fdeb9c6c420a 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in @@ -81,9 +81,8 @@ messages -> WebPage LegacyReceiver { 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