Reviewed by Anders.

        <rdar://problem/5629125> PluginInfoStore needs the ability to return the name of a plug-in for a given MIME type

        * page/mac/WebCoreViewFactory.h: Added pluginNameForMIMEType: method.
        * platform/PlugInInfoStore.h:
        * platform/gtk/TemporaryLinkStubs.cpp: Added stub version of pluginNameForMIMEType.
        (PlugInInfoStore::pluginNameForMIMEType):
        * platform/mac/PlugInInfoStoreMac.mm:
        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added.
        * platform/qt/PlugInInfoStoreQt.cpp:
        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added stub version of pluginNameForMIMEType.
        * plugins/win/PlugInInfoStoreWin.cpp:
        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added stub version of pluginNameForMIMEType.

        * WebCoreSupport/WebViewFactory.mm:
        (-[WebViewFactory pluginNameForMIMEType:]): Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 59996ff..49cae2c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2007-12-04  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Anders.
+
+        <rdar://problem/5629125> PluginInfoStore needs the ability to return the name of a plug-in for a given MIME type
+
+        * page/mac/WebCoreViewFactory.h: Added pluginNameForMIMEType: method.
+        * platform/PlugInInfoStore.h:
+        * platform/gtk/TemporaryLinkStubs.cpp: Added stub version of pluginNameForMIMEType.
+        (PlugInInfoStore::pluginNameForMIMEType):
+        * platform/mac/PlugInInfoStoreMac.mm:
+        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added.
+        * platform/qt/PlugInInfoStoreQt.cpp: 
+        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added stub version of pluginNameForMIMEType.
+        * plugins/win/PlugInInfoStoreWin.cpp: 
+        (WebCore::PlugInInfoStore::pluginNameForMIMEType): Added stub version of pluginNameForMIMEType.
+

 2007-12-04  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.
 2007-12-04  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/page/mac/WebCoreViewFactory.h b/WebCore/page/mac/WebCoreViewFactory.h
index 332074b..55514ed 100644 (file)
--- a/WebCore/page/mac/WebCoreViewFactory.h
+++ b/WebCore/page/mac/WebCoreViewFactory.h
@@ -36,6 +36,7 @@
 
 - (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
 - (void)refreshPlugins:(BOOL)reloadPages;
 
 - (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
 - (void)refreshPlugins:(BOOL)reloadPages;

+- (NSString *)pluginNameForMIMEType:(NSString *)MIMEType;

 - (BOOL)pluginSupportsMIMEType:(NSString *)MIMEType;
 
 - (NSString *)inputElementAltText;
 - (BOOL)pluginSupportsMIMEType:(NSString *)MIMEType;
 
 - (NSString *)inputElementAltText;

diff --git a/WebCore/platform/PlugInInfoStore.h b/WebCore/platform/PlugInInfoStore.h
index 356456f..e91b43e 100644 (file)
--- a/WebCore/platform/PlugInInfoStore.h
+++ b/WebCore/platform/PlugInInfoStore.h
@@ -51,6 +51,7 @@ class PlugInInfoStore {
 public:
     PluginInfo *createPluginInfoForPluginAtIndex(unsigned);
     unsigned pluginCount() const;
 public:
     PluginInfo *createPluginInfoForPluginAtIndex(unsigned);
     unsigned pluginCount() const;

+    static String PlugInInfoStore::pluginNameForMIMEType(const String& mimeType);

     static bool supportsMIMEType(const String& mimeType);
 };
 
     static bool supportsMIMEType(const String& mimeType);
 };
 

diff --git a/WebCore/platform/gtk/TemporaryLinkStubs.cpp b/WebCore/platform/gtk/TemporaryLinkStubs.cpp
index ec63186..1136cd4 100644 (file)
--- a/WebCore/platform/gtk/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/gtk/TemporaryLinkStubs.cpp
@@ -60,6 +60,7 @@ bool WebCore::historyContains(DeprecatedString const&) { return false; }
 
 PluginInfo* PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned) { notImplemented(); return 0;}
 unsigned PlugInInfoStore::pluginCount() const { notImplemented(); return 0; }
 
 PluginInfo* PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned) { notImplemented(); return 0;}
 unsigned PlugInInfoStore::pluginCount() const { notImplemented(); return 0; }

+String PlugInInfoStore::pluginNameForMIMEType(const String& mimeType) { notImplemented(); return String(); } 

 bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { notImplemented(); return false; }
 void WebCore::refreshPlugins(bool) { notImplemented(); }
 
 bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { notImplemented(); return false; }
 void WebCore::refreshPlugins(bool) { notImplemented(); }
 

diff --git a/WebCore/platform/mac/PlugInInfoStoreMac.mm b/WebCore/platform/mac/PlugInInfoStoreMac.mm
index 9254241..b5930b7 100644 (file)
--- a/WebCore/platform/mac/PlugInInfoStoreMac.mm
+++ b/WebCore/platform/mac/PlugInInfoStoreMac.mm
@@ -32,6 +32,11 @@
 
 namespace WebCore {
 
 
 namespace WebCore {
 

+String PlugInInfoStore::pluginNameForMIMEType(const String& mimeType)
+{
+    return [[WebCoreViewFactory sharedFactory] pluginNameForMIMEType:mimeType];
+}
+

 PluginInfo *PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned index)
 {
     PluginInfo *pluginInfo = new PluginInfo;
 PluginInfo *PlugInInfoStore::createPluginInfoForPluginAtIndex(unsigned index)
 {
     PluginInfo *pluginInfo = new PluginInfo;

diff --git a/WebCore/platform/qt/PlugInInfoStoreQt.cpp b/WebCore/platform/qt/PlugInInfoStoreQt.cpp
index d5a9e46..303b9e4 100644 (file)
--- a/WebCore/platform/qt/PlugInInfoStoreQt.cpp
+++ b/WebCore/platform/qt/PlugInInfoStoreQt.cpp
@@ -54,6 +54,13 @@ unsigned PlugInInfoStore::pluginCount() const
     return QWebFactoryLoader::self()->keys().count();
 }
 
     return QWebFactoryLoader::self()->keys().count();
 }
 

+String PlugInInfoStore::pluginNameForMIMEType(const String& mimeType)
+{
+    // FIXME: This method is stubbed out and should really return the name of a plug-in package for
+    // a given MIME type.
+    return String();
+}
+    

 bool PlugInInfoStore::supportsMIMEType(const WebCore::String& string)
 {
     bool supports = QWebFactoryLoader::self()->supportsMimeType(string);
 bool PlugInInfoStore::supportsMIMEType(const WebCore::String& string)
 {
     bool supports = QWebFactoryLoader::self()->supportsMimeType(string);

diff --git a/WebCore/plugins/win/PlugInInfoStoreWin.cpp b/WebCore/plugins/win/PlugInInfoStoreWin.cpp
index 8a5517f..ad51a2d 100644 (file)
--- a/WebCore/plugins/win/PlugInInfoStoreWin.cpp
+++ b/WebCore/plugins/win/PlugInInfoStoreWin.cpp
@@ -68,6 +68,14 @@ unsigned PlugInInfoStore::pluginCount() const
     return PluginDatabaseWin::installedPlugins()->plugins().size();
 }
 
     return PluginDatabaseWin::installedPlugins()->plugins().size();
 }
 

+
+String PlugInInfoStore::pluginNameForMIMEType(const String& mimeType)
+{
+    // FIXME 5629139: Implement this method on Windows.
+    return String();
+}
+
+    

 bool PlugInInfoStore::supportsMIMEType(const WebCore::String& mimeType) 
 {
     return PluginDatabaseWin::installedPlugins()->isMIMETypeRegistered(mimeType);
 bool PlugInInfoStore::supportsMIMEType(const WebCore::String& mimeType) 
 {
     return PluginDatabaseWin::installedPlugins()->isMIMETypeRegistered(mimeType);

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7a28e56..cf71046 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-04  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Anders.
+
+        <rdar://problem/5629125> PluginInfoStore needs the ability to return the name of a plug-in for a given MIME type
+
+        * WebCoreSupport/WebViewFactory.mm:
+        (-[WebViewFactory pluginNameForMIMEType:]): Added.
+

 2007-12-04  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Mark Rowe
 2007-12-04  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Mark Rowe

diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 27da454..e7174fe 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -71,6 +71,11 @@
     return [[WebPluginDatabase sharedDatabase] plugins];
 }
 
     return [[WebPluginDatabase sharedDatabase] plugins];
 }
 

+- (NSString *)pluginNameForMIMEType:(NSString *)MIMEType
+{
+    return [[[WebPluginDatabase sharedDatabase] pluginForMIMEType:MIMEType] name];
+}
+

 - (void)refreshPlugins:(BOOL)reloadPages
 {
     [[WebPluginDatabase sharedDatabase] refresh];
 - (void)refreshPlugins:(BOOL)reloadPages
 {
     [[WebPluginDatabase sharedDatabase] refresh];