Changeset 44000

Timestamp:

05/21/09 16:22:24 (10 months ago)

Author:

mitz@apple.com

Message:

Rubber-stamped by Mark Rowe.

• fix  https://bugs.webkit.org/show_bug.cgi?id=25947 Assertion failure in FrameLoader::transitionToCommitted on launch in Safari with r43985

Rolled out r43985.

• platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedNonImageMimeTypes): (WebCore::MIMETypeRegistry::isSupportedNonImageMIMEType):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-05-21  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=25947
+          Assertion failure in FrameLoader::transitionToCommitted on launch in
+          Safari with r43985
+
+        Rolled out r43985.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initializeSupportedNonImageMimeTypes):
+        (WebCore::MIMETypeRegistry::isSupportedNonImageMIMEType):
+
 2009-05-21  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -191 +191 @@
     static const char* types[] = {
 #if ENABLE(WML)
+        "text/vnd.wap.wml",
         "application/vnd.wap.wmlc",
 #endif
+        "text/html",
+        "text/xml",
+        "text/xsl",
+        "text/plain",
+        "text/",
         "application/xml",
         "application/xhtml+xml",
@@ -384 +390 @@
     if (mimeType.isEmpty())
         return false;
-    if (mimeType.startsWith("text/"))
-        return true;
     if (!supportedNonImageMIMETypes)
         initializeMIMETypeRegistry();