Changeset 163037 in webkit
- Timestamp:
- Jan 29, 2014 12:54:09 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r163032 r163037 1 2014-01-29 Anders Carlsson <andersca@apple.com> 2 3 Consolidate page loading functions 4 https://bugs.webkit.org/show_bug.cgi?id=127847 5 6 Reviewed by Tim Horton. 7 8 Get rid of the loadURL functions (and the LoadURL message), rename 9 loadURLRequest to loadRequest and change it to take a ResourceRequest instead 10 of an API::URLRequest. 11 12 * UIProcess/API/C/WKPage.cpp: 13 (WKPageLoadURL): 14 (WKPageLoadURLWithUserData): 15 (WKPageLoadURLRequest): 16 (WKPageLoadURLRequestWithUserData): 17 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: 18 (-[WKBrowsingContextController loadRequest:userData:]): 19 * UIProcess/API/Cocoa/WKWebView.mm: 20 (-[WKWebView loadRequest:]): 21 * UIProcess/WebInspectorProxy.cpp: 22 (WebKit::decidePolicyForNavigationAction): 23 (WebKit::WebInspectorProxy::createInspectorPage): 24 * UIProcess/WebPageProxy.cpp: 25 (WebKit::WebPageProxy::loadRequest): 26 (WebKit::WebPageProxy::loadFile): 27 * UIProcess/WebPageProxy.h: 28 * UIProcess/cf/WebPageProxyCF.cpp: 29 (WebKit::WebPageProxy::restoreFromSessionStateData): 30 * WebProcess/WebPage/WebPage.cpp: 31 (WebKit::WebPage::loadRequest): 32 * WebProcess/WebPage/WebPage.h: 33 * WebProcess/WebPage/WebPage.messages.in: 34 1 35 2014-01-29 Martin Robinson <mrobinson@igalia.com> 2 36 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r162967 r163037 83 83 void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef) 84 84 { 85 toImpl(pageRef)->load URL(toWTFString(URLRef));85 toImpl(pageRef)->loadRequest(toWTFString(URLRef)); 86 86 } 87 87 88 88 void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef) 89 89 { 90 toImpl(pageRef)->load URL(toWTFString(URLRef), toImpl(userDataRef));90 toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), toImpl(userDataRef)); 91 91 } 92 92 93 93 void WKPageLoadURLRequest(WKPageRef pageRef, WKURLRequestRef urlRequestRef) 94 94 { 95 toImpl(pageRef)->load URLRequest(toImpl(urlRequestRef));95 toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest()); 96 96 } 97 97 98 98 void WKPageLoadURLRequestWithUserData(WKPageRef pageRef, WKURLRequestRef urlRequestRef, WKTypeRef userDataRef) 99 99 { 100 toImpl(pageRef)->load URLRequest(toImpl(urlRequestRef), toImpl(userDataRef));100 toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest(), toImpl(userDataRef)); 101 101 } 102 102 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r162967 r163037 188 188 - (void)loadRequest:(NSURLRequest *)request userData:(id)userData 189 189 { 190 RefPtr<API::URLRequest> wkURLRequest = API::URLRequest::create(request);191 192 190 RefPtr<ObjCObjectGraph> wkUserData; 193 191 if (userData) 194 192 wkUserData = ObjCObjectGraph::create(userData); 195 193 196 _page->load URLRequest(wkURLRequest.get(), wkUserData.get());194 _page->loadRequest(request, wkUserData.get()); 197 195 } 198 196 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r162899 r163037 110 110 - (void)loadRequest:(NSURLRequest *)request 111 111 { 112 _page->load URLRequest(API::URLRequest::create(request).get());112 _page->loadRequest(request); 113 113 } 114 114 -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
r162675 r163037 395 395 396 396 // And instead load it in the inspected page. 397 webInspectorProxy->page()->load URLRequest(toImpl(requestRef));397 webInspectorProxy->page()->loadRequest(toImpl(requestRef)->resourceRequest()); 398 398 } 399 399 … … 472 472 m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL()); 473 473 474 inspectorPage->load URL(url);474 inspectorPage->loadRequest(URL(URL(), url)); 475 475 476 476 m_createdInspectorPage = true; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r162993 r163037 608 608 } 609 609 610 void WebPageProxy::load URL(const String& url, API::Object* userData)610 void WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData) 611 611 { 612 612 auto transaction = m_pageLoadState.transaction(); 613 613 614 m_pageLoadState.setPendingAPIRequestURL(transaction, url);614 m_pageLoadState.setPendingAPIRequestURL(transaction, request.url()); 615 615 616 616 if (!isValid()) … … 618 618 619 619 SandboxExtension::Handle sandboxExtensionHandle; 620 bool createdExtension = maybeInitializeSandboxExtensionHandle( URL(URL(), url), sandboxExtensionHandle);620 bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle); 621 621 if (createdExtension) 622 622 m_process->willAcquireUniversalFileReadSandboxExtension(); 623 m_process->send(Messages::WebPage::LoadURL(url, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID); 624 m_process->responsivenessTimer()->start(); 625 } 626 627 void WebPageProxy::loadURLRequest(API::URLRequest* urlRequest, API::Object* userData) 628 { 629 auto transaction = m_pageLoadState.transaction(); 630 631 m_pageLoadState.setPendingAPIRequestURL(transaction, urlRequest->resourceRequest().url()); 632 633 if (!isValid()) 634 reattachToWebProcess(); 635 636 SandboxExtension::Handle sandboxExtensionHandle; 637 bool createdExtension = maybeInitializeSandboxExtensionHandle(urlRequest->resourceRequest().url(), sandboxExtensionHandle); 638 if (createdExtension) 639 m_process->willAcquireUniversalFileReadSandboxExtension(); 640 m_process->send(Messages::WebPage::LoadURLRequest(urlRequest->resourceRequest(), sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID); 623 m_process->send(Messages::WebPage::LoadRequest(request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID); 641 624 m_process->responsivenessTimer()->start(); 642 625 } … … 665 648 SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle); 666 649 m_process->assumeReadAccessToBaseURL(resourceDirectoryURL); 667 m_process->send(Messages::WebPage::Load URL(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);650 m_process->send(Messages::WebPage::LoadRequest(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID); 668 651 m_process->responsivenessTimer()->start(); 669 652 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r162967 r163037 381 381 bool isClosed() const { return m_isClosed; } 382 382 383 void loadURL(const String&, API::Object* userData = nullptr); 384 void loadURLRequest(API::URLRequest*, API::Object* userData = nullptr); 383 void loadRequest(const WebCore::ResourceRequest&, API::Object* userData = nullptr); 385 384 void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr); 386 385 void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr); -
trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
r162710 r163037 177 177 178 178 if (provisionalURL) 179 load URL(provisionalURL);179 loadRequest(URL(URL(), provisionalURL)); 180 180 } 181 181 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r162990 r163037 892 892 } 893 893 894 void WebPage::loadURL(const String& url, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)895 {896 loadURLRequest(ResourceRequest(URL(URL(), url)), sandboxExtensionHandle, decoder);897 }898 899 894 void WebPage::loadURLInFrame(const String& url, uint64_t frameID) 900 895 { … … 906 901 } 907 902 908 void WebPage::load URLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)903 void WebPage::loadRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder) 909 904 { 910 905 SendStopResponsivenessTimer stopper(this); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r162990 r163037 724 724 // Actions 725 725 void tryClose(); 726 void loadURL(const String&, const SandboxExtension::Handle&, IPC::MessageDecoder&); 727 void loadURLRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&); 726 void loadRequest(const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&); 728 727 void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&); 729 728 void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
r162653 r163037 82 82 TryRestoreScrollPosition() 83 83 84 LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic85 84 LoadURLInFrame(String url, uint64_t frameID) 86 Load URLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic85 LoadRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic 87 86 LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic 88 87 LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
Note: See TracChangeset
for help on using the changeset viewer.