Changeset 106802 in webkit

Timestamp:

Feb 6, 2012 5:55:14 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry]Use extension for a mimetype as the suggested extension
if the url file doesn't have an extension.
​https://bugs.webkit.org/show_bug.cgi?id=76779

Patch by Charles Wei <​charles.wei@torchmobile.com.cn> on 2012-02-06
Reviewed by Antonio Gomes.

No new tests.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::sendResponseIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry]Use extension for a mimetype as the suggested extension
+        if the url file doesn't have an extension.
+        https://bugs.webkit.org/show_bug.cgi?id=76779
+
+        Reviewed by Antonio Gomes.
+
+        No new tests. 
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+
 2012-02-06  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -611 +611 @@
         m_response.setExpectedContentLength(contentLength.toInt64());
 
-    // Set suggested filename for downloads from the Content-Disposition header; if this fails, fill it in from the url
-    // skip this for data url's, because they have no Content-Disposition header and the format is wrong to be a filename.
+    // Set suggested filename for downloads from the Content-Disposition header; if this fails,
+    // fill it in from the url and sniffed mime type;Skip this for data and about URLs,
+    // because they have no Content-Disposition header and the format is wrong to be a filename.
     if (!m_isData && !m_isAbout) {
         String suggestedFilename = filenameFromHTTPContentDisposition(m_contentDisposition);
-        if (suggestedFilename.isNull())
-            suggestedFilename = urlFilename;
+        if (suggestedFilename.isEmpty()) {
+            // Check and see if an extension already exists.
+            String mimeExtension = MIMETypeRegistry::getPreferredExtensionForMIMEType(mimeType);
+            if (urlFilename.isEmpty()) {
+                if (mimeExtension.isEmpty()) // No extension found for the mimeType.
+                    suggestedFilename = String("Untitled");
+                else
+                    suggestedFilename = String("Untitled") + "." + mimeExtension;
+            } else {
+                if (urlFilename.reverseFind('.') == notFound && !mimeExtension.isEmpty())
+                   suggestedFilename = urlFilename + '.' + mimeExtension;
+                else
+                   suggestedFilename = urlFilename;
+            }
+        }
         m_response.setSuggestedFilename(suggestedFilename);
     }