Changeset 24869 in webkit

Timestamp:

Aug 4, 2007 7:06:22 PM (17 years ago)

Author:

ddkilzer

Message:

WebCore:

Reviewed by Oliver.

• fix for ​http://bugs.webkit.org/show_bug.cgi?id=14882 <rdar://problem/5386550> REGRESSION (r24866): text/plain documents are always downloaded

The supportedNonImageMimeTypes list is used to determine which MIME types may be viewed
within the web browser (e.g., plug-ins add their own MIME types to the list during
initialization), so we must add "text/plain" and "text/" back to the list. Since
this change would then break DOMImplementation::isTextMIMEType(), that method was reverted
to its original form and MIMETypeRegistry::shouldTreatAsText() was removed.

• dom/DOMImplementation.cpp: (WebCore::DOMImplementation::isTextMIMEType): Revert to previous version.
• platform/MIMETypeRegistry.cpp: (WebCore::initialiseSupportedNonImageMimeTypes): Added back "text/plain" and "text/" to the list. (WebCore::MIMETypeRegistry::shouldTreatAsText): Removed.
• platform/MIMETypeRegistry.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DOMImplementation.cpp (modified) (2 diffs)
• platform/MIMETypeRegistry.cpp (modified) (2 diffs)
• platform/MIMETypeRegistry.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-04  David Kilzer  <ddkilzer@webkit.org>
+
+        Reviewed by Oliver.
+
+        - fix for http://bugs.webkit.org/show_bug.cgi?id=14882
+          <rdar://problem/5386550> REGRESSION (r24866): text/plain documents are always downloaded
+
+        The supportedNonImageMimeTypes list is used to determine which MIME types may be viewed
+        within the web browser (e.g., plug-ins add their own MIME types to the list during
+        initialization), so we must add "text/plain" and "text/" back to the list.  Since
+        this change would then break DOMImplementation::isTextMIMEType(), that method was reverted
+        to its original form and MIMETypeRegistry::shouldTreatAsText() was removed.
+
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::isTextMIMEType): Revert to previous version.
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initialiseSupportedNonImageMimeTypes): Added back "text/plain" and "text/" to the list.
+        (WebCore::MIMETypeRegistry::shouldTreatAsText): Removed.
+        * platform/MIMETypeRegistry.h:
+
 2007-08-03  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/dom/DOMImplementation.cpp

@@ -38 +38 @@
 #include "ImageDocument.h"
 #include "MediaList.h"
-#include "MIMETypeRegistry.h"
 #include "Page.h"
 #include "PluginDocument.h"
@@ -331 +330 @@
 bool DOMImplementation::isTextMIMEType(const String& mimeType)
 {
-    return MIMETypeRegistry::shouldTreatAsText(mimeType);
+    if (mimeType == "application/x-javascript" ||
+        (mimeType.startsWith("text/") && mimeType != "text/html" &&
+         mimeType != "text/xml" && mimeType != "text/xsl"))
+        return true;
+    
+    return false;
 }
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -113 +113 @@
       "text/xml",
       "text/xsl",
+      "text/plain",
+      "text/",
       "application/x-javascript",
       "application/xml",
@@ -185 +187 @@
 }
 
-bool MIMETypeRegistry::shouldTreatAsText(const String& mimeType)
-{
-    return mimeType == "application/x-javascript" || (mimeType.startsWith("text/") && !isSupportedNonImageMIMEType(mimeType));
-}
-
 HashSet<String> &MIMETypeRegistry::getSupportedImageMIMETypes()
 {

trunk/WebCore/platform/MIMETypeRegistry.h

@@ -56 +56 @@
     static bool isJavaAppletMIMEType(const String& mimeType);
     
-    // Check to see if a mime type should be treated as text
-    // application/javascript is one that should be even though it doesn't start with text/
-    // text/html is one that *shouldn't* be by default even though it *does* start with text/
-    static bool shouldTreatAsText(const String& mimeType);
-
     static HashSet<String>& getSupportedImageMIMETypes();
     static HashSet<String>& getSupportedImageResourceMIMETypes();