Changeset 149711 in webkit


Ignore:
Timestamp:
May 7, 2013 10:08:32 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Clean up load interface in WebPage
https://bugs.webkit.org/show_bug.cgi?id=115622
Patch by Xuefei Ren <xren@blackberry.com> on 2013-05-07
Reviewed by Rob Buis.

Internal PR:315535
Internal reviewed by Mary Wu

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::load):
(BlackBerry::WebKit::WebPage::loadFile):
(BlackBerry::WebKit::WebPage::load):

  • Api/WebPage.h:
  • Api/WebPage_p.h:

(WebPagePrivate):

  • WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::startDownload):

Location:
trunk/Source/WebKit/blackberry
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r149685 r149711  
    672672};
    673673
    674 void WebPagePrivate::load(const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& networkToken, const BlackBerry::Platform::String& method, Platform::NetworkRequest::CachePolicy cachePolicy, const char* data, size_t dataLength, const char* const* headers, size_t headersLength, bool isInitial, bool mustHandleInternally, bool needReferer, bool forceDownload, const BlackBerry::Platform::String& overrideContentType, const BlackBerry::Platform::String& suggestedSaveName)
     674void WebPagePrivate::load(const Platform::NetworkRequest& netReq, bool needReferer)
    675675{
    676676    stopCurrentLoad();
    677677    DeferredTaskLoadManualScript::finishOrCancel(this);
    678678
    679     String urlString(url);
     679    String urlString(netReq.getUrlRef());
    680680    if (urlString.startsWith("vs:", false)) {
    681681        urlString = urlString.substring(3);
     
    694694    }
    695695
    696     if (isInitial)
    697         NetworkManager::instance()->setInitialURL(kurl);
    698 
    699696    ResourceRequest request(kurl);
    700     request.setToken(networkToken);
    701     if (isInitial || mustHandleInternally)
    702         request.setMustHandleInternally(true);
    703     request.setHTTPMethod(method);
    704     request.setCachePolicy(toWebCoreCachePolicy(cachePolicy));
    705     if (!overrideContentType.empty())
    706         request.setOverrideContentType(overrideContentType);
    707 
    708     if (data)
    709         request.setHTTPBody(FormData::create(data, dataLength));
    710 
    711     for (unsigned i = 0; i + 1 < headersLength; i += 2)
    712         request.addHTTPHeaderField(headers[i], headers[i + 1]);
     697    request.setHTTPMethod(netReq.getMethodRef());
     698    request.setCachePolicy(toWebCoreCachePolicy(netReq.getCachePolicy()));
     699    if (!netReq.getOverrideContentType().empty())
     700        request.setOverrideContentType(netReq.getOverrideContentType());
     701
     702    Platform::NetworkRequest::HeaderList& list = netReq.getHeaderListRef();
     703    if (!list.empty()) {
     704        for (unsigned i = 0; i < list.size(); i++)
     705            request.addHTTPHeaderField(list[i].first.c_str(), list[i].second.c_str());
     706    }
     707
    713708    if (needReferer && focusedOrMainFrame() && focusedOrMainFrame()->document())
    714709        request.addHTTPHeaderField("Referer", focusedOrMainFrame()->document()->url().string().utf8().data());
    715710
    716     if (forceDownload)
     711    if (Platform::NetworkRequest::TargetIsDownload == netReq.getTargetType())
    717712        request.setForceDownload(true);
    718 
    719     request.setSuggestedSaveName(suggestedSaveName);
     713    if (!netReq.getSuggestedSaveName().empty())
     714        request.setSuggestedSaveName(netReq.getSuggestedSaveName());
    720715
    721716    m_mainFrame->loader()->load(FrameLoadRequest(m_mainFrame, request));
     
    730725        return;
    731726
    732     d->load(fileUrl, BlackBerry::Platform::String::emptyString(), BlackBerry::Platform::String("GET", 3), Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, false, false, false, false, overrideContentType.c_str());
    733 }
    734 
    735 void WebPage::load(const Platform::NetworkRequest& request, bool needReferer, bool forceDownload)
    736 {
    737     vector<const char*> headers;
    738     Platform::NetworkRequest::HeaderList& list = request.getHeaderListRef();
    739     for (unsigned i = 0; i < list.size(); i++) {
    740         headers.push_back(list[i].first.c_str());
    741         headers.push_back(list[i].second.c_str());
    742     }
    743     d->load(request.getUrlRef(), BlackBerry::Platform::String::emptyString(), "GET", Platform::NetworkRequest::UseProtocolCachePolicy, 0, 0, headers.empty() ? 0 : &headers[0], headers.size(), false, false, needReferer, forceDownload, BlackBerry::Platform::String::emptyString(), request.getSuggestedSaveName());
     727    Platform::NetworkRequest netRequest;
     728    netRequest.setRequestUrl(path);
     729    netRequest.setOverrideContentType(overrideContentType);
     730    d->load(netRequest, false);
     731}
     732
     733void WebPage::load(const Platform::NetworkRequest& request, bool needReferer)
     734{
     735    d->load(request, needReferer);
    744736}
    745737
  • trunk/Source/WebKit/blackberry/Api/WebPage.h

    r149571 r149711  
    9393    void loadString(const BlackBerry::Platform::String&, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& contentType = "text/html", const BlackBerry::Platform::String& failingURL = BlackBerry::Platform::String::emptyString());
    9494
    95     void load(const Platform::NetworkRequest&, bool needReferer = false, bool forceDownload = false);
     95    void load(const Platform::NetworkRequest&, bool needReferer = false);
    9696
    9797    bool executeJavaScript(const BlackBerry::Platform::String& script, JavaScriptDataType& returnType, BlackBerry::Platform::String& returnValue);
  • trunk/Source/WebKit/blackberry/Api/WebPage_p.h

    r148512 r149711  
    116116    bool handleWheelEvent(WebCore::PlatformWheelEvent&);
    117117
    118     void load(const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& networkToken, const BlackBerry::Platform::String& method, Platform::NetworkRequest::CachePolicy, const char* data, size_t dataLength, const char* const* headers, size_t headersLength, bool isInitial, bool mustHandleInternally = false, bool needReferer = false, bool forceDownload = false, const BlackBerry::Platform::String& overrideContentType = BlackBerry::Platform::String::emptyString(), const BlackBerry::Platform::String& suggestedSaveName = BlackBerry::Platform::String::emptyString());
     118    void load(const Platform::NetworkRequest& platformRequest, bool needReferer = false);
    119119    void loadString(const BlackBerry::Platform::String&, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& mimeType, const BlackBerry::Platform::String& failingURL);
    120120    bool executeJavaScript(const BlackBerry::Platform::String& script, JavaScriptDataType& returnType, BlackBerry::Platform::String& returnValue);
  • trunk/Source/WebKit/blackberry/ChangeLog

    r149689 r149711  
     12013-05-07  Xuefei Ren  <xren@blackberry.com>
     2
     3        Clean up load interface in WebPage
     4        https://bugs.webkit.org/show_bug.cgi?id=115622
     5        Reviewed by Rob Buis.
     6
     7        Internal PR:315535
     8        Internal reviewed by  Mary Wu
     9
     10        * Api/WebPage.cpp:
     11        (BlackBerry::WebKit::WebPagePrivate::load):
     12        (BlackBerry::WebKit::WebPage::loadFile):
     13        (BlackBerry::WebKit::WebPage::load):
     14        * Api/WebPage.h:
     15        * Api/WebPage_p.h:
     16        (WebPagePrivate):
     17        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
     18        (WebCore::FrameLoaderClientBlackBerry::startDownload):
     19
    1202013-05-07  Mike Fenton  <mifenton@rim.com>
    221
  • trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

    r149182 r149711  
    11881188void FrameLoaderClientBlackBerry::startDownload(const ResourceRequest& request, const String& suggestedName)
    11891189{
    1190     m_webPagePrivate->load(request.url().string(), BlackBerry::Platform::String::emptyString(), "GET", NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, false, false, true, "", suggestedName);
     1190    if (suggestedName.empty())
     1191        m_webPagePrivate->m_mainFrame->loader()->load(FrameLoadRequest(m_webPagePrivate->m_mainFrame, request));
     1192    else {
     1193        ResourceRequest requestCopy = request;
     1194        requestCopy.setSuggestedSaveName(suggestedName);
     1195        m_webPagePrivate->m_mainFrame->loader()->load(FrameLoadRequest(m_webPagePrivate->m_mainFrame, requestCopy));
     1196    }
    11911197}
    11921198
Note: See TracChangeset for help on using the changeset viewer.