[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 47b48a61bd5491bb84cefae1244899bfe11441fe
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 14:43:21 2010 +0000

    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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0681322..ea3d38a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-29  Adam Roben  <aroben at apple.com>
+
+        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.
+
 2010-07-28  Sam Weinig  <sam at webkit.org>
 
         Another Windows build fix.
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
index f32b504..782b023 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
@@ -25,8 +25,9 @@
 
 #include "PluginInfoStore.h"
 
-#include <algorithm>
 #include <WebCore/KURL.h>
+#include <WebCore/MIMETypeRegistry.h>
+#include <algorithm>
 #include <wtf/StdLibExtras.h>
 
 using namespace std;
@@ -169,7 +170,7 @@ PluginInfoStore::Plugin PluginInfoStore::findPlugin(String& mimeType, const KURL
             return plugin;
         
         // Finally, try to get the MIME type from the extension in a platform specific manner and use that.
-        String extensionMimeType = mimeTypeFromExtension(extension);
+        String extensionMimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
         if (!extensionMimeType.isNull()) {
             Plugin plugin = findPluginForMIMEType(extensionMimeType);
             if (!plugin.path.isNull()) {
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.h b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
index 7b13395..bd56b19 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.h
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
@@ -73,7 +73,6 @@ private:
     static Vector<WebCore::String> pluginPathsInDirectory(const WebCore::String& directory);
     static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin);
     static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
-    static WebCore::String mimeTypeFromExtension(const WebCore::String& extension);
     
     Vector<WebCore::String> m_additionalPluginPaths;
     Vector<Plugin> m_plugins;
diff --git a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
index dda904c..883c524 100644
--- a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+++ b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
@@ -28,7 +28,6 @@
 #include <WebCore/WebCoreNSStringExtras.h>
 #include <wtf/HashSet.h>
 #include <wtf/RetainPtr.h>
-#include "WebKitSystemInterface.h"
 
 using namespace WebCore;
 
@@ -368,11 +367,4 @@ bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>
     return true;
 }
 
-String PluginInfoStore::mimeTypeFromExtension(const WebCore::String& extension)
-{
-    RetainPtr<CFStringRef> extensionCF(AdoptCF, safeCreateCFString(extension));
-    
-    return WKGetMIMETypeForExtension((NSString *)extensionCF.get());
-}
-
 } // namespace WebKit
diff --git a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
index d1709bb..62d5e78 100644
--- a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
+++ b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
@@ -55,11 +55,4 @@ bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>
     return false;
 }
 
-String PluginInfoStore::mimeTypeFromExtension(const WebCore::String& extension)
-{
-    notImplemented();
-    return String();
-}
-
-
 } // namespace WebKit
diff --git a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
index 091aa79..62d5e78 100644
--- a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
+++ b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
@@ -55,10 +55,4 @@ bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>
     return false;
 }
 
-String PluginInfoStore::mimeTypeFromExtension(const String& extension)
-{
-    notImplemented();
-    return String();
-}
-
 } // namespace WebKit

-- 
WebKit Debian packaging