Skip to content

Commit

Permalink
Revert 116138 (this regressed morejs perf on mac and win for some rea…
Browse files Browse the repository at this point in the history
…son.

My attempted fix in r116219 didn't work; I'm afraid you'll have to look
into this)

- Update required Flash version to 10.3.183.10.

See http://www.adobe.com/support/security/bulletins/apsb11-26.html.

BUG=81293
TEST=Flash Player 10.3.183.7 is considered out of date.


Review URL: http://codereview.chromium.org/9071005

TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/9008051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116231 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thakis@chromium.org committed Jan 3, 2012
1 parent b319e5c commit 34c235d
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions webkit/plugins/npapi/plugin_list.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

Expand Down Expand Up @@ -59,16 +59,9 @@ FilePath::CharType kDefaultPluginLibraryName[] =
// Some version ranges can be shared across operating systems. This should be
// done where possible to avoid duplication.
// This is up to date with
// http://www.adobe.com/support/security/bulletins/apsb11-28.html
// http://www.adobe.com/support/security/bulletins/apsb11-26.html
static const VersionRangeDefinition kFlashVersionRange[] = {
// Flash on Linux doesn't show the fourth version component, so we leave it
// out here in order to avoid blocking an up-to-date Flash.
#if defined(OS_LINUX)
#define FLASH_SUBVERSION ""
#else
#define FLASH_SUBVERSION ".55"
#endif
{ "", "", "11.1.102" FLASH_SUBVERSION, false }
{ "", "", "10.3.183", false }
};
// This is up to date with
// http://www.adobe.com/support/security/bulletins/apsb11-19.html
Expand Down Expand Up @@ -139,10 +132,10 @@ static const VersionRangeDefinition kJavaVersionRange[] = {
{ "7", "", "10.1", true } // JDK7u1 identifies itself as 10.1
};
// This is up to date with
// http://www.adobe.com/support/security/bulletins/apsb11-30.html
// http://www.adobe.com/support/security/bulletins/apsb11-24.html
static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
{ "10", "11", "10.1.1", false },
{ "9", "10", "9.4.7", false },
{ "9", "10", "9.4.6", false },
{ "0", "9", "8.3.1", false }
};
static const VersionRangeDefinition kDivXVersionRange[] = {
Expand Down

0 comments on commit 34c235d

Please sign in to comment.