diff options
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 3469d80..fff6622 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -569,7 +569,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( #if defined(OS_MACOSX) // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, - switches::kEnableFlashCoreAnimation, + switches::kDisableFlashCoreAnimation, #endif }; diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 95c866e..c253461 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -876,9 +876,9 @@ const char kNoProcessSingletonDialog[] = "no-process-singleton-dialog"; // is denied by the sandbox. const char kEnableSandboxLogging[] = "enable-sandbox-logging"; -// Temporary flag to allow Flash to negotiate the Core Animation drawing model. -// This will eventually become the default, and the flag can be removed. -const char kEnableFlashCoreAnimation[] = "enable-flash-core-animation"; +// Temporary flag to prevent Flash from negotiating the Core Animation drawing +// model. This will be removed once the last issues have been resolved. +const char kDisableFlashCoreAnimation[] = "disable-flash-core-animation"; #else // Enable Kiosk mode. const char kKioskMode[] = "kiosk"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 85bc3a3..f64b0e0 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -255,7 +255,7 @@ extern const char kNoProcessSingletonDialog[]; #endif #if defined(OS_MACOSX) -extern const char kEnableFlashCoreAnimation[]; +extern const char kDisableFlashCoreAnimation[]; extern const char kEnableSandboxLogging[]; #else extern const char kKioskMode[]; diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 8a5bd25..e345148 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -350,11 +350,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, |