From ee1c2b31b68f2bc5ea6e529be08d5797ced07ed5 Mon Sep 17 00:00:00 2001 From: "cevans@chromium.org" Date: Tue, 3 May 2011 01:34:24 +0000 Subject: Merge 83822 - Update Flash and Reader metadata. BUG=81293 Review URL: http://codereview.chromium.org/6909006 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/6909021 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83835 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/plugins/npapi/plugin_list.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'webkit/plugins') diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index 1195612..ebb503a 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -28,9 +28,17 @@ FilePath::CharType kDefaultPluginLibraryName[] = // Some version ranges can be shared across operating systems. This should be // done where possible to avoid duplication. +// This is uptodate with +// http://www.adobe.com/support/security/bulletins/apsb11-07.html static const VersionRangeDefinition kFlashVersionRange[] = { - { "", "", "10.2.153", false } + // Chrome Flash is .154 and always uptodate due to being built-in. + { "0", "10.2.155", "10.2.154", false }, + // External Flash (Linux x86_64) needs .159, and never had a .154 series + // release (which is why this split-range works nicely and simply). + { "10.2.155", "10.3", "10.2.159", false } }; +// This is uptodate with +// http://www.adobe.com/support/security/bulletins/apsb11-01.html static const VersionRangeDefinition kShockwaveVersionRange[] = { { "", "", "11.5.9.620", true } }; @@ -95,9 +103,11 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = { static const VersionRangeDefinition kJavaVersionRange[] = { { "0", "7", "6.0.240", true } // "240" is not a typo. }; +// This is uptodate with +// http://www.adobe.com/support/security/bulletins/apsb11-08.html static const VersionRangeDefinition kAdobeReaderVersionRange[] = { { "10", "11", "10.0.1", false }, - { "9", "10", "9.4.3", false }, + { "9", "10", "9.4.4", false }, { "0", "9", "8.2.6", false } }; static const VersionRangeDefinition kDivXVersionRange[] = { -- cgit v1.1