Merge "Fixes the handling of unspecified mime-type"

1 files changed, 18 insertions, 0 deletions

diff --git a/WebKit/android/WebCoreSupport/WebResponse.cpp b/WebKit/android/WebCoreSupport/WebResponse.cpp
index 57e9460..8f68a6a 100644
--- a/WebKit/android/WebCoreSupport/WebResponse.cpp
+++ b/WebKit/android/WebCoreSupport/WebResponse.cpp
@@ -26,9 +26,13 @@
 #include "config.h"
 #include "WebResponse.h"
 
+#include "MIMETypeRegistry.h"
+#include "PlatformString.h"
 #include "ResourceResponse.h"
 #include "ResourceError.h"
 
+#include <wtf/text/CString.h>
+
 using namespace std;
 
 namespace android {
@@ -42,6 +46,8 @@ WebResponse::WebResponse(URLRequest* request)
     m_url = request->url().spec();
     m_host = request->url().HostNoBrackets();
     request->GetMimeType(&m_mime);
+    setMimeType(m_mime);
+
     request->GetCharset(&m_encoding);
     m_expectedSize = request->GetExpectedContentSize();
 
@@ -67,6 +73,7 @@ WebResponse::WebResponse(const string &url, const string &mimeType, long long ex
     , m_mime(mimeType)
     , m_url(url)
 {
+    setMimeType(mimeType);
 }
 
 WebCore::ResourceResponse WebResponse::createResourceResponse()
@@ -110,6 +117,17 @@ const string& WebResponse::getMimeType() const
     return m_mime;
 }
 
+void WebResponse::setMimeType(const std::string &mimeType)
+{
+    if (mimeType.length() == 0 && m_url.length() > 0) {
+        WTF::String wtfMime(m_url.c_str(), m_url.length());
+        wtfMime = WebCore::MIMETypeRegistry::getMIMETypeForPath(wtfMime);
+        m_mime = std::string(wtfMime.utf8().data(), wtfMime.length());
+    } else {
+        m_mime = mimeType;
+    }
+}
+
 bool WebResponse::getHeader(const string& header, string* result) const
 {
     map<string, string>::const_iterator iter = m_headerFields.find(header);