Support for json media types as (non-image) mime types.

Source/core/inspector/NetworkResourcesData.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 13 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/NetworkResourcesData.h"
 
 #include "core/dom/DOMImplementation.h"
 #include "core/fetch/Resource.h"
+#include "platform/MIMETypeRegistry.h"
 #include "platform/SharedBuffer.h"
 #include "platform/network/ResourceResponse.h"
 
 namespace {
 // 100MB
 static size_t maximumResourcesContentSize = 100 * 1000 * 1000;
 
 // 10MB
 static size_t maximumSingleResourceContentSize = 10 * 1000 * 1000;
 }
@@ skipping 106 matching lines @@
 
 void NetworkResourcesData::resourceCreated(const String& requestId, const String& loaderId)
 {
     ensureNoDataForRequestId(requestId);
     m_requestIdToResourceDataMap.set(requestId, new ResourceData(requestId, loaderId));
 }
 
 static PassOwnPtr<TextResourceDecoder> createOtherResourceTextDecoder(const String& mimeType, const String& textEncodingName)
 {
     OwnPtr<TextResourceDecoder> decoder;
-    if (!textEncodingName.isEmpty())
+    if (!textEncodingName.isEmpty()) {
         decoder = TextResourceDecoder::create("text/plain", textEncodingName);
-    else if (DOMImplementation::isXMLMIMEType(mimeType.lower())) {
-        decoder = TextResourceDecoder::create("application/xml");
-        decoder->useLenientXMLDecoding();
-    } else if (equalIgnoringCase(mimeType, "text/html"))
-        decoder = TextResourceDecoder::create("text/html", "UTF-8");
-    else if (mimeType == "text/plain")
-        decoder = TextResourceDecoder::create("text/plain", "ISO-8859-1");
+    } else {
+        String mimeTypeLower = mimeType.lower();
+        if (DOMImplementation::isXMLMIMEType(mimeTypeLower)) {
+            decoder = TextResourceDecoder::create("application/xml");
+            decoder->useLenientXMLDecoding();
+        } else if (equalIgnoringCase(mimeType, "text/html")) {
+            decoder = TextResourceDecoder::create("text/html", "UTF-8");
+        } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeTypeLower) || DOMImplementation::isJSONMIMEType(mimeTypeLower)) {
+            decoder = TextResourceDecoder::create("text/plain", "UTF-8");
+        } else if (DOMImplementation::isTextMIMEType(mimeTypeLower)) {
+            decoder = TextResourceDecoder::create("text/plain", "ISO-8859-1");
+        }
+    }
     return decoder.release();
 }
 
 void NetworkResourcesData::responseReceived(const String& requestId, const String& frameId, const ResourceResponse& response)
 {
     ResourceData* resourceData = resourceDataForRequestId(requestId);
     if (!resourceData)
         return;
     resourceData->setFrameId(frameId);
     resourceData->setUrl(response.url());
@@ skipping 209 matching lines @@
         String requestId = m_requestIdsDeque.takeFirst();
         ResourceData* resourceData = resourceDataForRequestId(requestId);
         if (resourceData)
             m_contentSize -= resourceData->evictContent();
     }
     return true;
 }
 
 } // namespace WebCore