Changeset 163037 in webkit


Ignore:
Timestamp:
Jan 29, 2014 12:54:09 PM (10 years ago)
Author:
andersca@apple.com
Message:

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:
Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r163032 r163037  
     12014-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
    1352014-01-29  Martin Robinson  <mrobinson@igalia.com>
    236
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r162967 r163037  
    8383void WKPageLoadURL(WKPageRef pageRef, WKURLRef URLRef)
    8484{
    85     toImpl(pageRef)->loadURL(toWTFString(URLRef));
     85    toImpl(pageRef)->loadRequest(toWTFString(URLRef));
    8686}
    8787
    8888void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef)
    8989{
    90     toImpl(pageRef)->loadURL(toWTFString(URLRef), toImpl(userDataRef));
     90    toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), toImpl(userDataRef));
    9191}
    9292
    9393void WKPageLoadURLRequest(WKPageRef pageRef, WKURLRequestRef urlRequestRef)
    9494{
    95     toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef));   
     95    toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest());
    9696}
    9797
    9898void WKPageLoadURLRequestWithUserData(WKPageRef pageRef, WKURLRequestRef urlRequestRef, WKTypeRef userDataRef)
    9999{
    100     toImpl(pageRef)->loadURLRequest(toImpl(urlRequestRef), toImpl(userDataRef));   
     100    toImpl(pageRef)->loadRequest(toImpl(urlRequestRef)->resourceRequest(), toImpl(userDataRef));
    101101}
    102102
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r162967 r163037  
    188188- (void)loadRequest:(NSURLRequest *)request userData:(id)userData
    189189{
    190     RefPtr<API::URLRequest> wkURLRequest = API::URLRequest::create(request);
    191 
    192190    RefPtr<ObjCObjectGraph> wkUserData;
    193191    if (userData)
    194192        wkUserData = ObjCObjectGraph::create(userData);
    195193
    196     _page->loadURLRequest(wkURLRequest.get(), wkUserData.get());
     194    _page->loadRequest(request, wkUserData.get());
    197195}
    198196
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r162899 r163037  
    110110- (void)loadRequest:(NSURLRequest *)request
    111111{
    112     _page->loadURLRequest(API::URLRequest::create(request).get());
     112    _page->loadRequest(request);
    113113}
    114114
  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

    r162675 r163037  
    395395
    396396    // And instead load it in the inspected page.
    397     webInspectorProxy->page()->loadURLRequest(toImpl(requestRef));
     397    webInspectorProxy->page()->loadRequest(toImpl(requestRef)->resourceRequest());
    398398}
    399399
     
    472472    m_page->process().assumeReadAccessToBaseURL(inspectorBaseURL());
    473473
    474     inspectorPage->loadURL(url);
     474    inspectorPage->loadRequest(URL(URL(), url));
    475475
    476476    m_createdInspectorPage = true;
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r162993 r163037  
    608608}
    609609
    610 void WebPageProxy::loadURL(const String& url, API::Object* userData)
     610void WebPageProxy::loadRequest(const ResourceRequest& request, API::Object* userData)
    611611{
    612612    auto transaction = m_pageLoadState.transaction();
    613613
    614     m_pageLoadState.setPendingAPIRequestURL(transaction, url);
     614    m_pageLoadState.setPendingAPIRequestURL(transaction, request.url());
    615615
    616616    if (!isValid())
     
    618618
    619619    SandboxExtension::Handle sandboxExtensionHandle;
    620     bool createdExtension = maybeInitializeSandboxExtensionHandle(URL(URL(), url), sandboxExtensionHandle);
     620    bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle);
    621621    if (createdExtension)
    622622        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);
    641624    m_process->responsivenessTimer()->start();
    642625}
     
    665648    SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle);
    666649    m_process->assumeReadAccessToBaseURL(resourceDirectoryURL);
    667     m_process->send(Messages::WebPage::LoadURL(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
     650    m_process->send(Messages::WebPage::LoadRequest(fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
    668651    m_process->responsivenessTimer()->start();
    669652}
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r162967 r163037  
    381381    bool isClosed() const { return m_isClosed; }
    382382
    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);
    385384    void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
    386385    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  
    177177
    178178    if (provisionalURL)
    179         loadURL(provisionalURL);
     179        loadRequest(URL(URL(), provisionalURL));
    180180}
    181181
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r162990 r163037  
    892892}
    893893
    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 
    899894void WebPage::loadURLInFrame(const String& url, uint64_t frameID)
    900895{
     
    906901}
    907902
    908 void WebPage::loadURLRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
     903void WebPage::loadRequest(const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
    909904{
    910905    SendStopResponsivenessTimer stopper(this);
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r162990 r163037  
    724724    // Actions
    725725    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&);
    728727    void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
    729728    void loadHTMLString(const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r162653 r163037  
    8282    TryRestoreScrollPosition()
    8383
    84     LoadURL(String url, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
    8584    LoadURLInFrame(String url, uint64_t frameID)
    86     LoadURLRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
     85    LoadRequest(WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
    8786    LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
    8887    LoadHTMLString(String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
Note: See TracChangeset for help on using the changeset viewer.