diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 14 |
4 files changed, 2 insertions, 18 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 65172c8..fcf6c0b 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -603,7 +603,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( #if defined(OS_MACOSX) // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, - switches::kDisableFlashCoreAnimation, #endif switches::kRemoteShellPort, switches::kEnablePepperTesting, diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index f2ba206..e3f8ed8 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1234,10 +1234,6 @@ const char kPasswordStore[] = "password-store"; #endif #if defined(OS_MACOSX) -// 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 disable hole punching for accelerated surfaces. This is // here to aid debugging eventual problems, it can be removed once hole punching // has been out there for a few dev channel releases without problems. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 961bd6a..316e55c 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -363,7 +363,6 @@ extern const char kPasswordStore[]; #endif #if defined(OS_MACOSX) -extern const char kDisableFlashCoreAnimation[]; extern const char kDisableHolePunching[]; extern const char kEnableExposeForTabs[]; extern const char kEnableSandboxLogging[]; diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index fe7e90b..d46083bb 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -350,19 +350,9 @@ 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. - force_opaque_mode = true; } else { - // Current betas of Flash 10.1 don't respect QuickDraw negotiation either, - // so we still have to force opaque mode on 10.5 (where we don't support - // Core Animation). If the final version of Flash 10.1 is fixed to do - // drawing model negotiation correctly instead of assuming that QuickDraw - // is available without asking, this whole block (and the sys_info.h - // include) can be removed. + // Flash 10.1 doesn't respect QuickDraw negotiation either, so we still + // have to force opaque mode on 10.5 (where it doesn't use CA). int32 major, minor, bugfix; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); if (major < 10 || (major == 10 && minor < 6)) |