diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 20:05:13 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 20:05:13 +0000 |
| commit | ebc42b2266a2c04caef839b90363e3c52bc5c444 (patch) | |
| tree | 08ec0ef1763b3cb888b9bcdb44c1f763862b561e /content | |
| parent | b91bcfad07643ed87a132338fd1cb229e55d8923 (diff) | |
| download | chromium_src-ebc42b2266a2c04caef839b90363e3c52bc5c444.zip chromium_src-ebc42b2266a2c04caef839b90363e3c52bc5c444.tar.gz chromium_src-ebc42b2266a2c04caef839b90363e3c52bc5c444.tar.bz2 | |
Revert 282672 "Revert 281692 "Mac: Enable delegated renderer by ..."
I meant to revert r281866, not this ...
> Revert 281692 "Mac: Enable delegated renderer by default"
>
> This is causing tabs to get stuck white. Removing before today's
> Canary gets cut. The fix for the stuck white issue is being worked
> on at
> https://codereview.chromium.org/388793003/
>
> > Mac: Enable delegated renderer by default
> >
> > Delegated renderer disabled for layout tests (as on other platforms).
> >
> > BUG=314190
> > TBR=piman
> >
> > Review URL: https://codereview.chromium.org/374643002
>
> TBR=ccameron@chromium.org
>
> Review URL: https://codereview.chromium.org/386943008
TBR=ccameron@chromium.org
Review URL: https://codereview.chromium.org/388973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/compositor_util.cc | 4 | ||||
| -rw-r--r-- | content/browser/gpu/compositor_util_browsertest.cc | 2 | ||||
| -rw-r--r-- | content/shell/app/shell_main_delegate.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index be1a970..bcc6a9e 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -200,8 +200,8 @@ bool IsDelegatedRendererEnabled() { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); bool enabled = false; -#if defined(USE_AURA) - // Enable on Aura. +#if defined(USE_AURA) || defined(OS_MACOSX) + // Enable on Aura and Mac. enabled = true; #endif diff --git a/content/browser/gpu/compositor_util_browsertest.cc b/content/browser/gpu/compositor_util_browsertest.cc index 1f3b9f3..0c563c5 100644 --- a/content/browser/gpu/compositor_util_browsertest.cc +++ b/content/browser/gpu/compositor_util_browsertest.cc @@ -29,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) { #elif defined(OS_ANDROID) expected_mode = DELEGATED; #elif defined(OS_MACOSX) - expected_mode = THREADED; + expected_mode = DELEGATED; // Lion and SnowLeopard have compositing blacklisted when using the Apple // software renderer, so results will vary depending if this test is being // run in a VM versus actual hardware. diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index 773e0ae..b00e659 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -162,7 +162,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { command_line.AppendSwitch(switches::kEnableInbandTextTracks); command_line.AppendSwitch(switches::kMuteAudio); -#if defined(USE_AURA) || defined(OS_ANDROID) +#if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX) // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. command_line.AppendSwitch(switches::kDisableDelegatedRenderer); command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |