Changeset 110361 in webkit

Timestamp:

Mar 9, 2012 6:55:55 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

BlackBerry PlayBook doesn't sniff mime types
​https://bugs.webkit.org/show_bug.cgi?id=73869

Patch by Tyler Abbott <​tabbott@rim.com> on 2012-03-09
Reviewed by Rob Buis.

Hook up MIMESniffing for BlackBerry. Override Content-Types will
not be overriden. File extensions will be trusted when content
is loaded from disk.

No tests, BlackBerry tests are not yet present in webkit.org codebase.

• PlatformBlackBerry.cmake:
• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::NetworkJob):
(WebCore::NetworkJob::initialize):
(WebCore::NetworkJob::handleNotifyDataReceived):
(WebCore::NetworkJob::sendResponseIfNeeded):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformBlackBerry.cmake (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (5 diffs)
• platform/network/blackberry/NetworkJob.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-09  Tyler Abbott  <tabbott@rim.com>
+
+        BlackBerry PlayBook doesn't sniff mime types
+        https://bugs.webkit.org/show_bug.cgi?id=73869
+
+        Reviewed by Rob Buis.
+
+        Hook up MIMESniffing for BlackBerry. Override Content-Types will
+        not be overriden. File extensions will be trusted when content
+        is loaded from disk.
+
+        No tests, BlackBerry tests are not yet present in webkit.org codebase.
+
+        * PlatformBlackBerry.cmake:
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::NetworkJob):
+        (WebCore::NetworkJob::initialize):
+        (WebCore::NetworkJob::handleNotifyDataReceived):
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+
 2012-03-09  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/PlatformBlackBerry.cmake

@@ -88 +88 @@
 # Networking sources
 LIST(APPEND WebCore_SOURCES
+    platform/network/MIMESniffing.cpp
     platform/network/ProxyServer.cpp
     platform/network/blackberry/DeferredData.cpp

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

@@ -28 +28 @@
 #include "HTTPParsers.h"
 #include "KURL.h"
+#include "MIMESniffing.h"
 #include "MIMETypeRegistry.h"
 #include "NetworkManager.h"
@@ -108 +109 @@
     , m_isXHR(false)
     , m_needsRetryAsFTPDirectory(false)
+    , m_isOverrideContentType(false)
     , m_extendedStatusCode(0)
     , m_redirectCount(0)
@@ -152 +154 @@
     // We don't need to explicitly call notifyHeaderReceived, as the Content-Type
     // will ultimately get parsed when sendResponseIfNeeded gets called.
-    if (!request.getOverrideContentType().empty())
+    if (!request.getOverrideContentType().empty()) {
         m_contentType = String(request.getOverrideContentType().c_str());
+        m_isOverrideContentType = true;
+    }
 
     // No need to create the streams for data and about.
@@ -383 +387 @@
         return;
 
+    // The loadFile API sets the override content type,
+    // this will always be used as the content type and should not be overridden.
+    if (!m_dataReceived && !m_isOverrideContentType) {
+        bool shouldSniff = true;
+
+        // Don't bother sniffing the content type of a file that
+        // is on a file system if it has a MIME mappable file extension.
+        // The file extension is likely to be correct.
+        if (m_isFile) {
+            String urlFilename = m_response.url().lastPathComponent();
+            size_t pos = urlFilename.reverseFind('.');
+            if (pos != WTF::notFound) {
+                String extension = urlFilename.substring(pos + 1);
+                String mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
+                if (!mimeType.isEmpty())
+                    shouldSniff = false;
+            }
+        }
+
+        if (shouldSniff) {
+            MIMESniffer sniffer = MIMESniffer(m_contentType.latin1().data(), MIMETypeRegistry::isSupportedImageResourceMIMEType(m_contentType));
+            if (const char* type = sniffer.sniff(buf, std::min(len, sniffer.dataSize())))
+                m_sniffedMimeType = String(type);
+        }
+    }
+
     m_dataReceived = true;
 
@@ -584 +614 @@
     // if there's no custom sniffer header, try to set it from the Content-Type header
     // if this fails, guess it from extension.
-    String mimeType;
+    String mimeType = m_sniffedMimeType;
     if (m_isFTP && m_isFTPDir)
         mimeType = "application/x-ftp-directory";
-    else
-        mimeType = m_response.httpHeaderField(BlackBerry::Platform::NetworkRequest::HEADER_RIM_SNIFFED_MIME_TYPE);
     if (mimeType.isNull())
         mimeType = extractMIMETypeFromMediaType(m_contentType);

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

@@ -159 +159 @@
     Timer<NetworkJob> m_deleteJobTimer;
     String m_contentType;
+    String m_sniffedMimeType;
     String m_contentDisposition;
     BlackBerry::Platform::NetworkStreamFactory* m_streamFactory;
@@ -176 +177 @@
     bool m_isXHR; // FIXME - After 7.0, remove this. Only the Qt port reports HTTP error statuses as didFails, so we probably shouldn't.
     bool m_needsRetryAsFTPDirectory;
+    bool m_isOverrideContentType;
 
     // If an HTTP status code is received, m_extendedStatusCode and m_response.httpStatusCode will both be set to it.