[webkit-changes] [149810] trunk/Source/WebKit/blackberry

[commit-queue]

Title: [149810] trunk/Source/WebKit/blackberry

Revision

149810

Author

commit-qu...@webkit.org

Date

2013-05-09 08:42:09 -0700 (Thu, 09 May 2013)

Log Message

[BLACKBERRY]fix regression in Webpage
and FrameLoaderClientBlackberry
https://bugs.webkit.org/show_bug.cgi?id=115843

Patch by Xuefei Ren <x...@blackberry.com> on 2013-05-09
Reviewed by Rob Buis.

Internally reviewed by Mary Wu.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::loadFile):
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::startDownload):

Modified Paths

• trunk/Source/WebKit/blackberry/Api/WebPage.cpp
• trunk/Source/WebKit/blackberry/ChangeLog
• trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149809 => 149810)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-09 15:35:07 UTC (rev 149809)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-09 15:42:09 UTC (rev 149810)
@@ -727,7 +727,7 @@
         return;
 
     Platform::NetworkRequest netRequest;
-    netRequest.setRequestUrl(path);
+    netRequest.setRequestUrl(fileUrl);
     netRequest.setOverrideContentType(overrideContentType);
     d->load(netRequest, false);
 }

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149809 => 149810)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:35:07 UTC (rev 149809)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:42:09 UTC (rev 149810)
@@ -1,3 +1,18 @@
+2013-05-09  Xuefei Ren  <x...@blackberry.com>
+
+        [BLACKBERRY]fix regression in Webpage
+        and FrameLoaderClientBlackberry
+        https://bugs.webkit.org/show_bug.cgi?id=115843
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by Mary Wu.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::loadFile):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::startDownload):
+
 2013-05-09  Mike Fenton  <mifen...@rim.com>
 
         [BlackBerry] Style updates required based on new check-webkit-style

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (149809 => 149810)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp	2013-05-09 15:35:07 UTC (rev 149809)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp	2013-05-09 15:42:09 UTC (rev 149810)
@@ -1187,13 +1187,10 @@
 
 void FrameLoaderClientBlackBerry::startDownload(const ResourceRequest& request, const String& 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));
-    }
+    ResourceRequest requestCopy = request;
+    requestCopy.setSuggestedSaveName(suggestedName);
+    requestCopy.setForceDownload(true);
+    m_webPagePrivate->m_mainFrame->loader()->load(FrameLoadRequest(m_webPagePrivate->m_mainFrame, requestCopy));
 }
 
 void FrameLoaderClientBlackBerry::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, const ResourceRequest& request, const ResourceResponse& response)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes