Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/plugins/plugin_list.cc

Issue 5621006: Merge PluginGroups for Adobe Reader (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webkit/glue/plugins/plugin_group.cc ('K') | « webkit/glue/plugins/plugin_group_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_list.cc
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 922f6ce86afd67002be0289359c39ec87997ee46..ad309902f6c90aa0d370348f10e0347bfc42021c 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -32,56 +32,93 @@ namespace NPAPI {
// Plugins are listed here as soon as vulnerabilities and solutions
// (new versions) are published.
// TODO(panayiotis): Get the Real Player version on Mac, somehow.
+static const VersionRangeDefinition kQuicktimeVersionRange[] = {
+ { "", "", "7.6.6" }
+};
+static const VersionRangeDefinition kJavaVersionRange[] = {
+ { "", "", "" }
+};
+static const VersionRangeDefinition kFlashVersionRange[] = {
+ { "", "", "10.1.102" }
+};
+static const VersionRangeDefinition kSilverlightVersionRange[] = {
+ { "0", "4", "3.0.50106.0" },
+ { "4", "5", "" }
+};
+static const VersionRangeDefinition kFlip4MacVersionRange[] = {
+ { "", "", "2.2.1" }
+};
+static const VersionRangeDefinition kShockwaveVersionRange[] = {
+ { "", "", "11.5.9.615" }
+};
static const PluginGroupDefinition kGroupDefinitions[] = {
- { "apple-quicktime", "Quicktime", "QuickTime Plug-in", "", "", "7.6.6",
- "http://www.apple.com/quicktime/download/" },
- { "java-runtime-environment", "Java", "Java", "", "", "",
- "http://support.apple.com/kb/HT1338" },
- { "adobe-flash-player", "Flash", "Shockwave Flash", "", "", "10.1.102",
- "http://get.adobe.com/flashplayer/" },
- { "silverlight-3", "Silverlight 3", "Silverlight", "0", "4", "3.0.50106.0",
- "http://www.microsoft.com/getsilverlight/" },
- { "silverlight-4", "Silverlight 4", "Silverlight", "4", "5", "",
- "http://www.microsoft.com/getsilverlight/" },
- { "flip4mac", "Flip4Mac", "Flip4Mac", "", "", "2.2.1",
- "http://www.telestream.net/flip4mac-wmv/overview.htm" },
- { "shockwave", "Shockwave", "Shockwave for Director", "", "", "11.5.9.615",
- "http://www.adobe.com/shockwave/download/" }
+ { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
+ 1, "http://www.apple.com/quicktime/download/" },
+ { "java-runtime-environment", "Java", "Java", kJavaVersionRange,
+ 1, "http://support.apple.com/kb/HT1338" },
+ { "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
+ 1, "http://get.adobe.com/flashplayer/" },
+ { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
+ 2, "http://www.microsoft.com/getsilverlight/" },
+ { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
+ 1, "http://www.telestream.net/flip4mac-wmv/overview.htm" },
+ { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
+ 1, "http://www.adobe.com/shockwave/download/" }
};
#elif defined(OS_WIN)
// TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
// the RealPlayer files.
+static const VersionRangeDefinition kQuicktimeVersionRange[] = {
+ { "", "", "7.6.8" }
+};
+static const VersionRangeDefinition kJavaVersionRange[] = {
+ { "0", "7", "6.0.220" } // "220" is not a typo.
+};
+static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
+ { "10", "11", "" },
+ { "9", "10", "9.4.1" },
+ { "0", "9", "8.2.5" }
+};
+static const VersionRangeDefinition kFlashVersionRange[] = {
+ { "", "", "10.1.102" }
+};
+static const VersionRangeDefinition kSilverlightVersionRange[] = {
+ { "0", "4", "3.0.50106.0" },
+ { "4", "5", "" }
+};
+static const VersionRangeDefinition kShockwaveVersionRange[] = {
+ { "", "", "11.5.9.615" }
+};
+static const VersionRangeDefinition kDivXVersionRange[] = {
+ { "", "", "1.4.3.4" }
+};
static const PluginGroupDefinition kGroupDefinitions[] = {
- { "apple-quicktime", "Quicktime", "QuickTime Plug-in", "", "", "7.6.8",
- "http://www.apple.com/quicktime/download/" },
- { "java-runtime-environment", "Java 6", "Java", "", "6", "6.0.220",
- "http://www.java.com/" },
- { "adobe-reader", PluginGroup::kAdobeReader9GroupName, "Adobe Acrobat", "9",
- "10", "9.4.1", "http://get.adobe.com/reader/" },
- { "adobe-reader-8", PluginGroup::kAdobeReader8GroupName, "Adobe Acrobat", "0",
- "9", "8.2.5", "http://get.adobe.com/reader/" },
- { "adobe-flash-player", "Flash", "Shockwave Flash", "", "", "10.1.102",
- "http://get.adobe.com/flashplayer/" },
- { "silverlight-3", "Silverlight 3", "Silverlight", "0", "4", "3.0.50106.0",
- "http://www.microsoft.com/getsilverlight/" },
- { "silverlight-4", "Silverlight 4", "Silverlight", "4", "5", "",
- "http://www.microsoft.com/getsilverlight/" },
- { "shockwave", "Shockwave", "Shockwave for Director", "", "", "11.5.9.615",
- "http://www.adobe.com/shockwave/download/" },
- { "divx-player", "DivX Player", "DivX Web Player", "", "", "1.4.3.4",
- "http://download.divx.com/divx/autoupdate/player/"
+ { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
+ 1, "http://www.apple.com/quicktime/download/" },
Bernhard Bauer 2010/12/08 13:36:30 Please use arraysize() instead of hard-coding it.
Jakob Kummerow 2010/12/09 08:58:17 Done.
+ { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
+ 1, "http://www.java.com/" },
+ { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
+ kAdobeReaderVersionRange, 3, "http://get.adobe.com/reader/" },
+ { "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
+ 1, "http://get.adobe.com/flashplayer/" },
+ { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
+ 2, "http://www.microsoft.com/getsilverlight/" },
+ { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
+ 1, "http://www.adobe.com/shockwave/download/" },
+ { "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
+ 1, "http://download.divx.com/divx/autoupdate/player/"
"DivXWebPlayerInstaller.exe" },
- // These are here for grouping, no vulnerabilies known.
+ // These are here for grouping, no vulnerabilities known.
{ "windows-media-player", "Windows Media Player", "Windows Media Player",
- "", "", "", "" },
+ NULL, 0, "" },
{ "microsoft-office", "Microsoft Office", "Microsoft Office",
- "", "", "", "" },
+ NULL, 0, "" },
// TODO(panayiotis): The vulnerable versions are
// (v >= 6.0.12.1040 && v <= 6.0.12.1663)
// || v == 6.0.12.1698 || v == 6.0.12.1741
- { "realplayer", "RealPlayer", "RealPlayer", "", "", "",
- "http://www.adobe.com/shockwave/download/" },
+ { "realplayer", "RealPlayer", "RealPlayer", NULL, 0,
+ "www.real.com/realplayer/downloads" },
};
#else
« webkit/glue/plugins/plugin_group.cc ('K') | « webkit/glue/plugins/plugin_group_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698