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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53342 0039d316-1c4b-4281-b951-d872f2087c98

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 793e96a..80bf260 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -572,7 +572,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
-    switches::kDisableFlashCoreAnimation,
+    switches::kEnableFlashCoreAnimation,
 #endif
     switches::kRemoteShellPort,
     switches::kEnablePepperTesting,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 93586b5..66c864f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1074,9 +1074,9 @@ const char kPasswordStore[]                 = "password-store";
 // is denied by the sandbox.
 const char kEnableSandboxLogging[]          = "enable-sandbox-logging";
 
-// 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";
+// 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";
 #else
 // Enable Kiosk mode.
 const char kKioskMode[]                     = "kiosk";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ce8a7bc..e3806ee 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -322,7 +322,7 @@ extern const char kPasswordStore[];
 #endif
 
 #if defined(OS_MACOSX)
-extern const char kDisableFlashCoreAnimation[];
+extern const char kEnableFlashCoreAnimation[];
 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 8847957..3459edf 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::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.
+    } 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.
       force_opaque_mode = true;
     } else {
       // Current betas of Flash 10.1 don't respect QuickDraw negotiation either,