Title: [151677] trunk/Source/WebCore
- Revision
- 151677
- Author
- [email protected]
- Date
- 2013-06-18 02:13:13 -0700 (Tue, 18 Jun 2013)
Log Message
[BlackBerry] only notify download client when download error
https://bugs.webkit.org/show_bug.cgi?id=117687
Reviewed by Rob Buis.
When met network error in downloading, we notify the error to download
client through download stream, we shouldn't notify page client the error.
RIM JIRA 419985
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::shouldNotifyClientFailed):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151676 => 151677)
--- trunk/Source/WebCore/ChangeLog 2013-06-18 08:35:20 UTC (rev 151676)
+++ trunk/Source/WebCore/ChangeLog 2013-06-18 09:13:13 UTC (rev 151677)
@@ -1,3 +1,17 @@
+2013-06-18 Mary Wu <[email protected]>
+
+ [BlackBerry] only notify download client when download error
+ https://bugs.webkit.org/show_bug.cgi?id=117687
+
+ Reviewed by Rob Buis.
+
+ When met network error in downloading, we notify the error to download
+ client through download stream, we shouldn't notify page client the error.
+ RIM JIRA 419985
+
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::shouldNotifyClientFailed):
+
2013-06-18 Mario Sanchez Prada <[email protected]>
Shader compiler not properly configured for GLES on cairo based ports
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (151676 => 151677)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-06-18 08:35:20 UTC (rev 151676)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-06-18 09:13:13 UTC (rev 151677)
@@ -601,7 +601,15 @@
bool NetworkJob::shouldNotifyClientFailed() const
{
- return m_extendedStatusCode < 0 || (isError(m_extendedStatusCode) && !m_dataReceived && !m_isHeadMethod && m_handle->firstRequest().targetType() != ResourceRequest::TargetIsXHR);
+ ResourceRequest request = m_handle->firstRequest();
+ if (request.forceDownload())
+ return false;
+ if (m_extendedStatusCode < 0)
+ return true;
+ if (isError(m_extendedStatusCode) && !m_dataReceived && !m_isHeadMethod && request.targetType() != ResourceRequest::TargetIsXHR)
+ return true;
+
+ return false;
}
bool NetworkJob::retryAsFTPDirectory()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
