Changeset 88842 in webkit

Timestamp:

Jun 14, 2011 12:37:06 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-14 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Remove PluginInfoStore::Plugin typedef
​https://bugs.webkit.org/show_bug.cgi?id=62657

• UIProcess/Plugins/PluginInfoStore.h:
• UIProcess/Plugins/win/PluginInfoStoreWin.cpp: (WebKit::PluginInfoStore::getPluginInfo): (WebKit::PluginInfoStore::shouldUsePlugin):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/PluginInfoStore.h (modified) (1 diff)
• UIProcess/Plugins/win/PluginInfoStoreWin.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Remove PluginInfoStore::Plugin typedef
+        https://bugs.webkit.org/show_bug.cgi?id=62657
+
+        * UIProcess/Plugins/PluginInfoStore.h:
+        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
+        (WebKit::PluginInfoStore::getPluginInfo):
+        (WebKit::PluginInfoStore::shouldUsePlugin):
+
 2011-06-14  Anders Carlsson  <andersca@apple.com>
 

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

@@ -40 +40 @@
 public:
     PluginInfoStore();
-
-    // FIXME: Remove this typedef.
-    typedef PluginModuleInfo Plugin;
 
     void setAdditionalPluginsDirectories(const Vector<String>&);

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

@@ -324 +324 @@
 }
 
-bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
+bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
 {
     return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
@@ -396 +396 @@
     String pluginFileName = pathGetFileName(plugin.path);
     for (size_t i = 0; i < alreadyLoadedPlugins.size(); ++i) {
-        const Plugin& loadedPlugin = alreadyLoadedPlugins[i];
+        const PluginModuleInfo& loadedPlugin = alreadyLoadedPlugins[i];
 
         // If a plug-in with the same filename already exists, we don't want to load it.