Changeset 64278 in webkit


Ignore:
Timestamp:
Jul 29, 2010 7:43:21 AM (14 years ago)
Author:
Adam Roben
Message:

Remove PluginInfoStore::mimeTypeFromExtension

WebCore::MIMETypeRegistry already provides a cross-platform interface
for this.

Fixes <​http://webkit.org/b/43188>
PluginInfoStore::mimeTypeFromExtension is unnecessary

Reviewed by Nikolas Zimmermann.

  • UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::PluginInfoStore::findPlugin): Changed to use
MIMETypeRegistry.

  • UIProcess/Plugins/PluginInfoStore.h:
  • UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
  • UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
  • UIProcess/Plugins/win/PluginInfoStoreWin.cpp:

Removed mimeTypeFromExtension.

Location:
trunk/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r64258 r64278  
     12010-07-29  Adam Roben  <aroben@apple.com>
     2
     3        Remove PluginInfoStore::mimeTypeFromExtension
     4
     5        WebCore::MIMETypeRegistry already provides a cross-platform interface
     6        for this.
     7
     8        Fixes <http://webkit.org/b/43188>
     9        PluginInfoStore::mimeTypeFromExtension is unnecessary
     10
     11        Reviewed by Nikolas Zimmermann.
     12
     13        * UIProcess/Plugins/PluginInfoStore.cpp:
     14        (WebKit::PluginInfoStore::findPlugin): Changed to use
     15        MIMETypeRegistry.
     16
     17        * UIProcess/Plugins/PluginInfoStore.h:
     18        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
     19        * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
     20        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
     21        Removed mimeTypeFromExtension.
     22
    1232010-07-28  Sam Weinig  <sam@webkit.org>
    224

  • trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

    r63621 r64278  
    2626#include "PluginInfoStore.h"
    2727
     28#include <WebCore/KURL.h>
     29#include <WebCore/MIMETypeRegistry.h>
    2830#include <algorithm>
    29 #include <WebCore/KURL.h>
    3031#include <wtf/StdLibExtras.h>
    3132
    … …  
    170171       
    171172        // Finally, try to get the MIME type from the extension in a platform specific manner and use that.
    172         String extensionMimeType = mimeTypeFromExtension(extension);
     173        String extensionMimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
    173174        if (!extensionMimeType.isNull()) {
    174175            Plugin plugin = findPluginForMIMEType(extensionMimeType);

  • trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h

    r63621 r64278  
    7474    static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin);
    7575    static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
    76     static WebCore::String mimeTypeFromExtension(const WebCore::String& extension);
    7776   
    7877    Vector<WebCore::String> m_additionalPluginPaths;

  • trunk/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

    r62600 r64278  
    2929#include <wtf/HashSet.h>
    3030#include <wtf/RetainPtr.h>
    31 #include "WebKitSystemInterface.h"
    3231
    3332using namespace WebCore;
    … …  
    369368}
    370369
    371 String PluginInfoStore::mimeTypeFromExtension(const WebCore::String& extension)
    372 {
    373     RetainPtr<CFStringRef> extensionCF(AdoptCF, safeCreateCFString(extension));
    374    
    375     return WKGetMIMETypeForExtension((NSString *)extensionCF.get());
    376 }
    377 
    378370} // namespace WebKit

  • trunk/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp

    r63207 r64278  
    5656}
    5757
    58 String PluginInfoStore::mimeTypeFromExtension(const WebCore::String& extension)
    59 {
    60     notImplemented();
    61     return String();
    62 }
    63 
    64 
    6558} // namespace WebKit

  • trunk/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp

    r62605 r64278  
    5656}
    5757
    58 String PluginInfoStore::mimeTypeFromExtension(const String& extension)
    59 {
    60     notImplemented();
    61     return String();
    62 }
    63 
    6458} // namespace WebKit
Note: See TracChangeset for help on using the changeset viewer.