Merge 90308

Source/WebCore/platform/chromium/PlatformBridge.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 186 matching lines @@
     static int memoryUsageMB();
 
     // Same as above, but always returns actual value, without any caches.
     static int actualMemoryUsageMB();
 
     // MimeType -----------------------------------------------------------
     static bool isSupportedImageMIMEType(const String& mimeType);
     static bool isSupportedJavaScriptMIMEType(const String& mimeType);
     static bool isSupportedNonImageMIMEType(const String& mimeType);
     static String mimeTypeForExtension(const String& fileExtension);
+    static String wellKnownMimeTypeForExtension(const String& fileExtension);
     static String mimeTypeFromFile(const String& filePath);
     static String preferredExtensionForMIMEType(const String& mimeType);
 
     // Plugin -------------------------------------------------------------
     static bool plugins(bool refresh, Vector<PluginInfo>*);
     static NPObject* pluginScriptableObject(Widget*);
     static bool popupsAllowed(NPP);
 
     // Resources ----------------------------------------------------------
     static PassRefPtr<Image> loadPlatformImageResource(const char* name);
@@ skipping 188 matching lines @@
 
     // Visited links ------------------------------------------------------
     static LinkHash visitedLinkHash(const UChar* url, unsigned length);
     static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
     static bool isLinkVisited(LinkHash);
 };
 
 } // namespace WebCore
 
 #endif