Merge 57386 - 2010-04-09 Abhishek Arya <inferno@chromium.org>...

WebCore/dom/DOMImplementation.cpp

Index: WebCore/dom/DOMImplementation.cpp
===================================================================
--- WebCore/dom/DOMImplementation.cpp	(revision 49838)
+++ WebCore/dom/DOMImplementation.cpp	(working copy)
@@ -284,9 +284,10 @@
 
 bool DOMImplementation::isTextMIMEType(const String& mimeType)
 {
-    if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) ||
-        (mimeType.startsWith("text/") && mimeType != "text/html" &&
-         mimeType != "text/xml" && mimeType != "text/xsl"))
+    if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType)
+        || mimeType == "application/json" // Render JSON as text/plain.
+        || (mimeType.startsWith("text/") && mimeType != "text/html"
+            && mimeType != "text/xml" && mimeType != "text/xsl"))
         return true;
 
     return false;