Attachment 151684 Details for Bug 90974 – Patch

[patch] Patch

bug-90974-20120711195942.patch (text/plain), 2.59 KB, created by Mary Wu on 2012-07-11 04:59:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Wu

Created: 2012-07-11 04:59:45 PDT

Size: 2.59 KB

patch

obsolete

>Subversion Revision: 122088
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 761c8abc23362cfff6e4055e72c7a5e2eb975e2c..11201fe9f25e778070eb0e9c13a4509399b844bd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2012-07-11  Mary Wu  <mary.wu@torchmobile.com.cn>
>+
>+        [BlackBerry] Some small changes in network code.
>+        https://bugs.webkit.org/show_bug.cgi?id=90974
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        1. Set status when NetworkJob closed so that its wrapped stream
>+        can also query the result after NetworkJob handling redirect/
>+        authenticate etc.
>+        2. pass download attribute to NetworkRequest.
>+        RIM PR# 171555
>+
>+        Reviewed internally by Lyon Chen.
>+
>+        * platform/network/blackberry/NetworkJob.cpp:
>+        (WebCore::NetworkJob::handleNotifyClose):
>+        * platform/network/blackberry/ResourceRequestBlackBerry.cpp:
>+        (WebCore::platformTargetTypeForRequest):
>+
> 2012-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r121968.
>diff --git a/Source/WebCore/platform/network/blackberry/NetworkJob.cpp b/Source/WebCore/platform/network/blackberry/NetworkJob.cpp
>index c64fdc8aacc720537a7a56ea985a07a338aaffbe..d57b624d9b180d0b36cdbe3e3f448902e736da7a 100644
>--- a/Source/WebCore/platform/network/blackberry/NetworkJob.cpp
>+++ b/Source/WebCore/platform/network/blackberry/NetworkJob.cpp
>@@ -480,6 +480,7 @@ void NetworkJob::handleNotifyClose(int status)
> 
>             sendResponseIfNeeded();
>             if (isClientAvailable()) {
>+                m_status = isError(m_extendedStatusCode) ? BlackBerry::Platform::FilterStream::StatusNetworkError: BlackBerry::Platform::FilterStream::StatusSuccess;
> 
>                 RecursionGuard guard(m_callingClient);
>                 if (shouldNotifyClientFailed()) {
>diff --git a/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp b/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp
>index 5cffde039ddd3c0253afba35528915cb0f3ec19b..3c439d91ff3fa76093188cb22aa914c47ee54528 100644
>--- a/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp
>+++ b/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp
>@@ -55,6 +55,8 @@ static inline NetworkRequest::TargetType platformTargetTypeForRequest(const Reso
> {
>     if (request.isXMLHTTPRequest())
>         return NetworkRequest::TargetIsXMLHTTPRequest;
>+    if (request.forceDownload())
>+        return NetworkRequest::TargetIsDownload;
> 
>     switch (request.targetType()) {
>     case ResourceRequest::TargetIsMainFrame:

Actions: View | Formatted Diff | Diff

Attachments on bug 90974: 151684 | 152204 | 152264