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

WebCore/platform/MIMETypeRegistry.cpp

 /*
  * Copyright (C) 2006, 2008, 2009 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 185 matching lines @@
         "text/html",
         "text/xml",
         "text/xsl",
         "text/plain",
         "text/",
         "application/xml",
         "application/xhtml+xml",
         "application/vnd.wap.xhtml+xml",
         "application/rss+xml",
         "application/atom+xml",
+        "application/json",
 #if ENABLE(SVG)
         "image/svg+xml",
 #endif
 #if ENABLE(FTPDIR)
         "application/x-ftp-directory",
 #endif
         "multipart/x-mixed-replace"
+        // Note: ADDING a new type here will probably render it as HTML. This can
+        // result in cross-site scripting.
     };
+    COMPILE_ASSERT(sizeof(types) / sizeof(types[0]) <= 16,
+                   nonimage_mime_types_must_be_less_than_or_equal_to_16);
+
     for (size_t i = 0; i < sizeof(types)/sizeof(types[0]); ++i)
         supportedNonImageMIMETypes->add(types[i]);
 
     ArchiveFactory::registerKnownArchiveMIMETypes();
 }
 
 static void initializeMediaTypeMaps()
 {
     struct TypeExtensionPair {
         const char* type;
@@ skipping 225 matching lines @@
     return *supportedMediaMIMETypes;
 }
 
 const String& defaultMIMEType()
 {
     DEFINE_STATIC_LOCAL(const String, defaultMIMEType, ("application/octet-stream"));
     return defaultMIMEType;
 }
 
 } // namespace WebCore