Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149710 => 149711)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-08 03:18:12 UTC (rev 149710)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-08 05:08:32 UTC (rev 149711)
@@ -671,12 +671,12 @@
}
};
-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)
+void WebPagePrivate::load(const Platform::NetworkRequest& netReq, bool needReferer)
{
stopCurrentLoad();
DeferredTaskLoadManualScript::finishOrCancel(this);
- String urlString(url);
+ String urlString(netReq.getUrlRef());
if (urlString.startsWith("vs:", false)) {
urlString = urlString.substring(3);
m_mainFrame->setInViewSourceMode(true);
@@ -693,31 +693,26 @@
return;
}
- if (isInitial)
- NetworkManager::instance()->setInitialURL(kurl);
-
ResourceRequest request(kurl);
- request.setToken(networkToken);
- if (isInitial || mustHandleInternally)
- request.setMustHandleInternally(true);
- request.setHTTPMethod(method);
- request.setCachePolicy(toWebCoreCachePolicy(cachePolicy));
- if (!overrideContentType.empty())
- request.setOverrideContentType(overrideContentType);
+ request.setHTTPMethod(netReq.getMethodRef());
+ request.setCachePolicy(toWebCoreCachePolicy(netReq.getCachePolicy()));
+ if (!netReq.getOverrideContentType().empty())
+ request.setOverrideContentType(netReq.getOverrideContentType());
- if (data)
- request.setHTTPBody(FormData::create(data, dataLength));
+ Platform::NetworkRequest::HeaderList& list = netReq.getHeaderListRef();
+ if (!list.empty()) {
+ for (unsigned i = 0; i < list.size(); i++)
+ request.addHTTPHeaderField(list[i].first.c_str(), list[i].second.c_str());
+ }
- for (unsigned i = 0; i + 1 < headersLength; i += 2)
- request.addHTTPHeaderField(headers[i], headers[i + 1]);
if (needReferer && focusedOrMainFrame() && focusedOrMainFrame()->document())
request.addHTTPHeaderField("Referer", focusedOrMainFrame()->document()->url().string().utf8().data());
- if (forceDownload)
+ if (Platform::NetworkRequest::TargetIsDownload == netReq.getTargetType())
request.setForceDownload(true);
+ if (!netReq.getSuggestedSaveName().empty())
+ request.setSuggestedSaveName(netReq.getSuggestedSaveName());
- request.setSuggestedSaveName(suggestedSaveName);
-
m_mainFrame->loader()->load(FrameLoadRequest(m_mainFrame, request));
}
@@ -729,18 +724,15 @@
else if (!fileUrl.startsWith("file:///"))
return;
- 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());
+ Platform::NetworkRequest netRequest;
+ netRequest.setRequestUrl(path);
+ netRequest.setOverrideContentType(overrideContentType);
+ d->load(netRequest, false);
}
-void WebPage::load(const Platform::NetworkRequest& request, bool needReferer, bool forceDownload)
+void WebPage::load(const Platform::NetworkRequest& request, bool needReferer)
{
- vector<const char*> headers;
- Platform::NetworkRequest::HeaderList& list = request.getHeaderListRef();
- for (unsigned i = 0; i < list.size(); i++) {
- headers.push_back(list[i].first.c_str());
- headers.push_back(list[i].second.c_str());
- }
- 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());
+ d->load(request, needReferer);
}
void WebPagePrivate::loadString(const BlackBerry::Platform::String& string, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& contentType, const BlackBerry::Platform::String& failingURL)
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (149710 => 149711)
--- trunk/Source/WebKit/blackberry/Api/WebPage.h 2013-05-08 03:18:12 UTC (rev 149710)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h 2013-05-08 05:08:32 UTC (rev 149711)
@@ -92,7 +92,7 @@
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());
- void load(const Platform::NetworkRequest&, bool needReferer = false, bool forceDownload = false);
+ void load(const Platform::NetworkRequest&, bool needReferer = false);
bool executeJavaScript(const BlackBerry::Platform::String& script, _javascript_DataType& returnType, BlackBerry::Platform::String& returnValue);
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (149710 => 149711)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2013-05-08 03:18:12 UTC (rev 149710)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2013-05-08 05:08:32 UTC (rev 149711)
@@ -115,7 +115,7 @@
bool handleMouseEvent(WebCore::PlatformMouseEvent&);
bool handleWheelEvent(WebCore::PlatformWheelEvent&);
- 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());
+ void load(const Platform::NetworkRequest& platformRequest, bool needReferer = false);
void loadString(const BlackBerry::Platform::String&, const BlackBerry::Platform::String& baseURL, const BlackBerry::Platform::String& mimeType, const BlackBerry::Platform::String& failingURL);
bool executeJavaScript(const BlackBerry::Platform::String& script, _javascript_DataType& returnType, BlackBerry::Platform::String& returnValue);
bool executeJavaScriptInIsolatedWorld(const WebCore::ScriptSourceCode&, _javascript_DataType& returnType, BlackBerry::Platform::String& returnValue);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149710 => 149711)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-08 03:18:12 UTC (rev 149710)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-08 05:08:32 UTC (rev 149711)
@@ -1,3 +1,22 @@
+2013-05-07 Xuefei Ren <[email protected]>
+
+ Clean up load interface in WebPage
+ https://bugs.webkit.org/show_bug.cgi?id=115622
+ 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):
+
2013-05-07 Mike Fenton <[email protected]>
[BlackBerry] Increase the padding size for caret based scrolling.
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (149710 => 149711)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-05-08 03:18:12 UTC (rev 149710)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-05-08 05:08:32 UTC (rev 149711)
@@ -1187,7 +1187,13 @@
void FrameLoaderClientBlackBerry::startDownload(const ResourceRequest& request, const String& suggestedName)
{
- m_webPagePrivate->load(request.url().string(), BlackBerry::Platform::String::emptyString(), "GET", NetworkRequest::UseProtocolCachePolicy, 0, 0, 0, 0, false, false, true, "", suggestedName);
+ if (suggestedName.empty())
+ m_webPagePrivate->m_mainFrame->loader()->load(FrameLoadRequest(m_webPagePrivate->m_mainFrame, request));
+ else {
+ ResourceRequest requestCopy = request;
+ requestCopy.setSuggestedSaveName(suggestedName);
+ m_webPagePrivate->m_mainFrame->loader()->load(FrameLoadRequest(m_webPagePrivate->m_mainFrame, requestCopy));
+ }
}
void FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, const ResourceRequest& request, const ResourceResponse& response)
