diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 17:26:05 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 17:26:05 +0000 |
| commit | ea6089c7c205c2cbfd1470c430bfe16f97e46370 (patch) | |
| tree | 139b76fa481fa04e910f71dbd150d42dbf833ea7 /chrome/renderer | |
| parent | 59f5e0204cbc0e524b2687fb1beddda82047d16d (diff) | |
| download | chromium_src-ea6089c7c205c2cbfd1470c430bfe16f97e46370.zip chromium_src-ea6089c7c205c2cbfd1470c430bfe16f97e46370.tar.gz chromium_src-ea6089c7c205c2cbfd1470c430bfe16f97e46370.tar.bz2 | |
Revert 53342 - Switch back to disabling Core Animation for Flash (for branch merge).
This goes back to the M5 logic for managing Flash model negotiation on the Mac.
BUG=49169
TEST=Flash should not negotation Core Animation mode unless --enable-flash-core-animation is passed. White flickering shouldn't happen, find bar and full screen UI should show.
Review URL: http://codereview.chromium.org/3044015
TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/2832074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 3459edf..8847957 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -347,11 +347,11 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url, // Older versions of Flash don't support CA (and they assume QuickDraw // support, so we can't rely on negotiation to do the right thing). force_opaque_mode = true; - } else if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableFlashCoreAnimation)) { - // Temporary switch for testing; once we are confident that there are no - // regressions from CoreGraphics mode to CoreAnimation mode, this switch - // (and the chrome_switches.h and command_line.h includes) can be removed. + } else if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableFlashCoreAnimation)) { + // Temporary switch for testing; once any Flash + Core Animation issues + // have been shaken out, this switch (and the chrome_switches.h and + // command_line.h includes) can be removed. force_opaque_mode = true; } else { // Current betas of Flash 10.1 don't respect QuickDraw negotiation either, |