diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 04:43:38 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 04:43:38 +0000 |
| commit | 6a901e59094139f2c22c97e22bd3bca0830e1869 (patch) | |
| tree | 2f904e943df8e207f453ab907bb372ad3544998b /content/browser/gpu | |
| parent | 20bbf8d3d3b088e368bad93b199ca5295e256522 (diff) | |
| download | chromium_src-6a901e59094139f2c22c97e22bd3bca0830e1869.zip chromium_src-6a901e59094139f2c22c97e22bd3bca0830e1869.tar.gz chromium_src-6a901e59094139f2c22c97e22bd3bca0830e1869.tar.bz2 | |
Enable delegated renderer on Chrome OS too
BUG=123444
Review URL: https://codereview.chromium.org/50263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/compositor_util.cc | 5 | ||||
| -rw-r--r-- | content/browser/gpu/compositor_util_browsertest.cc | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index 32d5f7a..d440cb9 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -263,9 +263,8 @@ bool IsDelegatedRendererEnabled() { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); bool enabled = false; -#if defined(USE_AURA) && !defined(OS_CHROMEOS) - // Enable on non-ChromeOS Aura. Chrome OS has driver issues on some platforms: - // https://code.google.com/p/chrome-os-partner/issues/detail?id=22688 +#if defined(USE_AURA) + // Enable on Aura. enabled = true; #endif diff --git a/content/browser/gpu/compositor_util_browsertest.cc b/content/browser/gpu/compositor_util_browsertest.cc index 1a6fde9..3bb8eea 100644 --- a/content/browser/gpu/compositor_util_browsertest.cc +++ b/content/browser/gpu/compositor_util_browsertest.cc @@ -25,11 +25,7 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) { DELEGATED, // Implies threaded } expected_mode = DISABLED; #if defined(USE_AURA) -#if defined(OS_CHROMEOS) - expected_mode = THREADED; -#else expected_mode = DELEGATED; -#endif #elif defined(OS_ANDROID) expected_mode = THREADED; #elif defined(OS_MACOSX) |