Changeset 24866 in webkit

Timestamp:

Aug 4, 2007 12:29:55 AM (17 years ago)

Author:

beidson

Message:

WebCore:

Reviewed by Oliver

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=14824 and <rdar://problem/5372989>

Two issues -
1 - The WebCore MIMEType registry was designed assuming the list of types would never change

That is false, as WebKit has API and SPI calls which directly mutate the MIMETypeRegistry

2 - DOMImplementation didn't consult the registry for any MIMEType that started with "text/",

instead maintaining it's own hard coded rules

• dom/DOMImplementation.cpp: (WebCore::DOMImplementation::isTextMIMEType): For now, call through to the MIMETypeRegistry until we decided a different fate for this function

• platform/MIMETypeRegistry.cpp: (WebCore::initialiseSupportedNonImageMimeTypes): "SupportedNonImageMIMETypes" is really a misnomer for "MIMETypes we should show as HTML" but that line has slowly been blurred since Tiger. In an attempt to start to unblur it, remove "text/" and "text/plain" (WebCore::MIMETypeRegistry::shouldTreatAsText): The decision is very close to the old DOMImplementation method, except we don't automatically hand off "text/" types as true if they are in the set of supported MIMETypes (WebCore::MIMETypeRegistry::getSupportedImageMIMETypes): Non-const (can be changed!) (WebCore::MIMETypeRegistry::getSupportedImageResourceMIMETypes): Non-const (can be changed!) (WebCore::MIMETypeRegistry::getSupportedNonImageMIMETypes): Non-const (can be changed!)
• platform/MIMETypeRegistry.h:

WebKit:

Reviewed by Oliver

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=14824 and <rdar://problem/5372989>

When unregistering a MIMEType, remove it from the WebCore registry unconditionally
When registrying a MIMEType whose view class is WebHTMLView, add it to the WebCore registry

• WebView/WebView.mm: (+[WebView _unregisterViewClassAndRepresentationClassForMIMEType:]): (+[WebView _registerViewClass:representationClass:forURLScheme:]): (+[WebView registerViewClass:representationClass:forMIMEType:]):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/DOMImplementation.cpp (modified) (2 diffs)
• WebCore/platform/MIMETypeRegistry.cpp (modified) (4 diffs)
• WebCore/platform/MIMETypeRegistry.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebView.mm (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-03  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Oliver
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=14824 and <rdar://problem/5372989>
+
+        Two issues - 
+        1 - The WebCore MIMEType registry was designed assuming the list of types would never change
+            That is false, as WebKit has API and SPI calls which directly mutate the MIMETypeRegistry
+        2 - DOMImplementation didn't consult the registry for any MIMEType that started with "text/", 
+            instead maintaining it's own hard coded rules
+
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::isTextMIMEType): For now, call through to the MIMETypeRegistry
+          until we decided a different fate for this function
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initialiseSupportedNonImageMimeTypes):  "SupportedNonImageMIMETypes" is really a misnomer for 
+          "MIMETypes we should show as HTML" but that line has slowly been blurred since Tiger.  In an attempt
+          to start to unblur it, remove "text/" and "text/plain"
+        (WebCore::MIMETypeRegistry::shouldTreatAsText):  The decision is very close to the old DOMImplementation 
+          method, except we don't automatically hand off "text/" types as true if they are in the set of supported
+          MIMETypes
+        (WebCore::MIMETypeRegistry::getSupportedImageMIMETypes): Non-const (can be changed!)
+        (WebCore::MIMETypeRegistry::getSupportedImageResourceMIMETypes): Non-const (can be changed!)
+        (WebCore::MIMETypeRegistry::getSupportedNonImageMIMETypes): Non-const (can be changed!)
+        * platform/MIMETypeRegistry.h:
+
 2007-08-03  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/dom/DOMImplementation.cpp

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

trunk/WebCore/platform/MIMETypeRegistry.cpp

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

trunk/WebCore/platform/MIMETypeRegistry.h

@@ -55 +55 @@
     // Check to see if a mime type is a valid Java applet mime type
     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 const HashSet<String>& getSupportedImageMIMETypes();
-    static const HashSet<String>& getSupportedImageResourceMIMETypes();
-    static const HashSet<String>& getSupportedNonImageMIMETypes();
+    static HashSet<String>& getSupportedImageMIMETypes();
+    static HashSet<String>& getSupportedImageResourceMIMETypes();
+    static HashSet<String>& getSupportedNonImageMIMETypes();
 };
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-08-03  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Oliver
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=14824 and <rdar://problem/5372989>
+
+        When unregistering a MIMEType, remove it from the WebCore registry unconditionally
+        When registrying a MIMEType whose view class is WebHTMLView, add it to the WebCore registry
+
+        * WebView/WebView.mm:
+        (+[WebView _unregisterViewClassAndRepresentationClassForMIMEType:]): 
+        (+[WebView _registerViewClass:representationClass:forURLScheme:]):
+        (+[WebView registerViewClass:representationClass:forMIMEType:]):
+
 2007-08-03  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebKit/WebView/WebView.mm

@@ -104 +104 @@
 #import <WebCore/HistoryItem.h>
 #import <WebCore/Logging.h>
+#import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/Page.h>
 #import <WebCore/PageCache.h>
@@ -1100 +1101 @@
     [[WebFrameView _viewTypesAllowImageTypeOmission:NO] removeObjectForKey:MIMEType];
     [[WebDataSource _repTypesAllowImageTypeOmission:NO] removeObjectForKey:MIMEType];
+    
+    // FIXME: We also need to maintain MIMEType registrations (which can be dynamically changed)
+    // in the WebCore MIMEType registry.  For now we're doing this in a safe, limited manner
+    // to fix <INSERT RADAR HERE> - a future revamping of the entire system is neccesary for future robustness
+    MIMETypeRegistry::getSupportedNonImageMIMETypes().remove(MIMEType);
 }
 
@@ -1107 +1113 @@
     [self registerViewClass:viewClass representationClass:representationClass forMIMEType:MIMEType];
 
+    // FIXME: We also need to maintain MIMEType registrations (which can be dynamically changed)
+    // in the WebCore MIMEType registry.  For now we're doing this in a safe, limited manner
+    // to fix <INSERT RADAR HERE> - a future revamping of the entire system is neccesary for future robustness
+    if ([viewClass class] == [WebHTMLView class])
+        MIMETypeRegistry::getSupportedNonImageMIMETypes().add(MIMEType);
+    
     // This is used to make _representationExistsForURLScheme faster.
     // Without this set, we'd have to create the MIME type each time.
@@ -2489 +2501 @@
     [[WebFrameView _viewTypesAllowImageTypeOmission:YES] setObject:viewClass forKey:MIMEType];
     [[WebDataSource _repTypesAllowImageTypeOmission:YES] setObject:representationClass forKey:MIMEType];
+    
+    // FIXME: We also need to maintain MIMEType registrations (which can be dynamically changed)
+    // in the WebCore MIMEType registry.  For now we're doing this in a safe, limited manner
+    // to fix <INSERT RADAR HERE> - a future revamping of the entire system is neccesary for future robustness
+    if ([viewClass class] == [WebHTMLView class])
+        MIMETypeRegistry::getSupportedNonImageMIMETypes().add(MIMEType);
 }