Changeset 57208 in webkit

Timestamp:

Apr 7, 2010 7:14:27 AM (14 years ago)

Author:

Simon Hausmann

Message:

​https://bugs.webkit.org/show_bug.cgi?id=36827

Patch by Dawit Alemayehu <​adawit@kde.org> on 2010-04-07
Reviewed by Simon Hausmann.

WebCore:

Replaced the 'shouldTreatAsAttachment' function with a more generic
function that returns the content disposition type.

See comments 39-42 in ​https://bugs.webkit.org/show_bug.cgi?id=36395

• platform/network/HTTPParsers.cpp:

(WebCore::contentDispositionType):

• platform/network/HTTPParsers.h:

(WebCore::):

WebKit/chromium:

Updated the WebCore::shouldTreatAsAttachement function call with the
new more generic replacement WebCore::contentDispositionType.

See comments 39-42 in ​https://bugs.webkit.org/show_bug.cgi?id=36395

• src/FrameLoaderClientImpl.cpp:

(WebKit::FrameLoaderClientImpl::dispatchDecidePolicyForMIMEType):

WebKit/qt:

Updated the WebCore::shouldTreatAsAttachement function call with the
new more generic replacement WebCore::contentDispositionType.

See comments 39-42 in ​https://bugs.webkit.org/show_bug.cgi?id=36395

• WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/HTTPParsers.cpp (modified) (3 diffs)
• WebCore/platform/network/HTTPParsers.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/FrameLoaderClientImpl.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-07  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36827
+
+        Replaced the 'shouldTreatAsAttachment' function with a more generic 
+        function that returns the content disposition type.
+
+        See comments 39-42 in https://bugs.webkit.org/show_bug.cgi?id=36395
+
+        * platform/network/HTTPParsers.cpp:
+        (WebCore::contentDispositionType):
+        * platform/network/HTTPParsers.h:
+        (WebCore::):
+
 2010-04-07  Vitaly Repeshko  <vitalyr@chromium.org>
 

trunk/WebCore/platform/network/HTTPParsers.cpp

@@ -73 +73 @@
 }
 
-bool shouldTreatAsAttachment(const ResourceResponseBase& response)
-{
-    const String& contentDisposition = response.httpHeaderField("Content-Disposition");
-    
+ContentDispositionType contentDispositionType(const String& contentDisposition)
+{   
     if (contentDisposition.isEmpty())
-        return false;
+        return ContentDispositionNone;
 
     // Some broken sites just send
@@ -84 +82 @@
     // screen those out here.
     if (contentDisposition.startsWith(";"))
-        return false;
+        return ContentDispositionNone;
 
     if (contentDisposition.startsWith("inline", false))
-        return false;
+        return ContentDispositionInline;
 
     // Some broken sites just send
@@ -93 +91 @@
     // without a disposition token... screen those out.
     if (contentDisposition.startsWith("filename", false))
-        return false;
+        return ContentDispositionNone;
 
     // Also in use is Content-Disposition: name="file"
     if (contentDisposition.startsWith("name", false))
-        return false;
+        return ContentDispositionNone;
 
     // We have a content-disposition of "attachment" or unknown.
     // RFC 2183, section 2.8 says that an unknown disposition
     // value should be treated as "attachment"
-    return true;  
+    return ContentDispositionAttachment;  
 }
 

trunk/WebCore/platform/network/HTTPParsers.h

@@ -42 +42 @@
 };
 
+typedef enum {
+    ContentDispositionNone,
+    ContentDispositionInline,
+    ContentDispositionAttachment,
+    ContentDispositionOther
+} ContentDispositionType;
 
-bool shouldTreatAsAttachment(const ResourceResponseBase& response);
+ContentDispositionType contentDispositionType(const String&);
 bool parseHTTPRefresh(const String& refresh, bool fromHttpEquivMeta, double& delay, String& url);
 double parseDate(const String&);

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-07  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36827
+
+        Updated the WebCore::shouldTreatAsAttachement function call with the
+        new more generic replacement WebCore::contentDispositionType.
+
+        See comments 39-42 in https://bugs.webkit.org/show_bug.cgi?id=36395
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDecidePolicyForMIMEType):
+
 2010-04-07  Jochen Eisinger  <jochen@chromium.org>
 

trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -844 +844 @@
         // The server does not want us to replace the page contents.
         action = PolicyIgnore;
-    } else if (WebCore::shouldTreatAsAttachment(response)) {
+    } else if (WebCore::contentDispositionType(response.httpHeaderField("Content-Disposition")) == WebCore::ContentDispositionAttachment) {
         // The server wants us to download instead of replacing the page contents.
         // Downloading is handled by the embedder, but we still get the initial

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-07  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36827
+
+        Updated the WebCore::shouldTreatAsAttachement function call with the
+        new more generic replacement WebCore::contentDispositionType.
+
+        See comments 39-42 in https://bugs.webkit.org/show_bug.cgi?id=36395
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
+
 2010-04-07  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -970 +970 @@
 {
     // we need to call directly here
-    if (WebCore::shouldTreatAsAttachment(m_frame->loader()->activeDocumentLoader()->response()))
-        callPolicyFunction(function, PolicyDownload);    
+    const ResourceResponse& response = m_frame->loader()->activeDocumentLoader()->response();
+    if (WebCore::contentDispositionType(response.httpHeaderField("Content-Disposition")) == WebCore::ContentDispositionAttachment)
+        callPolicyFunction(function, PolicyDownload);
     else if (canShowMIMEType(MIMEType))
         callPolicyFunction(function, PolicyUse);