summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 22:23:52 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 22:23:52 +0000
commit61dc45c2ee406701d1ba66c7b898ab2239451d95 (patch)
tree09945a8587ffd218ad961ec211a46888918359ec /content/renderer
parent4621acbe7ba1ffc3a60a0200302ccb49a0c7296a (diff)
downloadchromium_src-61dc45c2ee406701d1ba66c7b898ab2239451d95.zip
chromium_src-61dc45c2ee406701d1ba66c7b898ab2239451d95.tar.gz
chromium_src-61dc45c2ee406701d1ba66c7b898ab2239451d95.tar.bz2
Remove wmode hack for older versions of Flash on the Mac
Since two major releases of Flash (10.3 and 11) now handle QuickDraw negotiation correctly, remove the hack per the comment--it's no longer important that 10.2 and earlier are performant, since nobody should be running them. BUG=None TEST=The current version of Flash should continue to work normally. Review URL: http://codereview.chromium.org/8245005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/webplugin_delegate_proxy.cc28
1 files changed, 0 insertions, 28 deletions
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 7bc3875..10f5b7a 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -262,22 +262,6 @@ static bool SilverlightColorIsTransparent(const std::string& color) {
return false;
}
-#if defined(OS_MACOSX)
-// Returns true if the given Flash version assumes QuickDraw support is present
-// instead of checking using the negotiation system.
-static bool FlashVersionAssumesQuickDrawSupport(const string16& version) {
- scoped_ptr<Version> plugin_version(
- webkit::npapi::PluginGroup::CreateVersionFromString(version));
- if (plugin_version.get() && plugin_version->components().size() >= 2) {
- uint16 major = plugin_version->components()[0];
- uint16 minor = plugin_version->components()[1];
- return major < 10 || (major == 10 && minor < 3);
- }
- // If parsing fails for some reason, assume the best.
- return false;
-}
-#endif
-
bool WebPluginDelegateProxy::Initialize(
const GURL& url,
const std::vector<std::string>& arg_names,
@@ -343,18 +327,6 @@ bool WebPluginDelegateProxy::Initialize(
transparent_ = true;
}
}
-#if defined(OS_MACOSX)
- // Older versions of Flash just assume QuickDraw support during negotiation,
- // so force everything but transparent mode to use opaque mode on 10.5
- // (where Flash doesn't use CA) to prevent QuickDraw from being used.
- // TODO(stuartmorgan): Remove this code once the two latest major Flash
- // releases negotiate correctly.
- if (flash && !transparent_ && base::mac::IsOSLeopardOrEarlier() &&
- FlashVersionAssumesQuickDrawSupport(info_.version)) {
- params.arg_names.push_back("wmode");
- params.arg_values.push_back("opaque");
- }
-#endif
params.load_manually = load_manually;
plugin_ = plugin;