Title: [88842] trunk/Source/WebKit2
- Revision
- 88842
- Author
- [email protected]
- Date
- 2011-06-14 12:37:06 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Anders Carlsson <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88841 => 88842)
--- trunk/Source/WebKit2/ChangeLog 2011-06-14 19:10:20 UTC (rev 88841)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-14 19:37:06 UTC (rev 88842)
@@ -2,6 +2,18 @@
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 <[email protected]>
+
+ Reviewed by Sam Weinig.
+
Create the PluginModuleInfo class and reverse the typedef so that PluginInfoStore::Plugin is now a typedef
https://bugs.webkit.org/show_bug.cgi?id=62654
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h (88841 => 88842)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2011-06-14 19:10:20 UTC (rev 88841)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2011-06-14 19:37:06 UTC (rev 88842)
@@ -40,9 +40,6 @@
public:
PluginInfoStore();
- // FIXME: Remove this typedef.
- typedef PluginModuleInfo Plugin;
-
void setAdditionalPluginsDirectories(const Vector<String>&);
void refresh();
Modified: trunk/Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp (88841 => 88842)
--- trunk/Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp 2011-06-14 19:10:20 UTC (rev 88841)
+++ trunk/Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp 2011-06-14 19:37:06 UTC (rev 88842)
@@ -323,7 +323,7 @@
return version.QuadPart;
}
-bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
+bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
{
return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
}
@@ -395,7 +395,7 @@
// only the first. <http://webkit.org/b/58469>
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.
if (equalIgnoringCase(pluginFileName, pathGetFileName(loadedPlugin.path)))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
