summaryrefslogtreecommitdiffstats
path: root/chrome/test/gpu
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 21:05:59 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 21:05:59 +0000
commitddf48eac85c977e2098139ee5dd79d5ad56828d1 (patch)
treefe82e9efa923e8c71590a1ef06d44894c6239fe0 /chrome/test/gpu
parentc954bc19a781aa4226cb677836c361af7af2b770 (diff)
downloadchromium_src-ddf48eac85c977e2098139ee5dd79d5ad56828d1.zip
chromium_src-ddf48eac85c977e2098139ee5dd79d5ad56828d1.tar.gz
chromium_src-ddf48eac85c977e2098139ee5dd79d5ad56828d1.tar.bz2
Enable software compositing in renderer for win aura.
BUG=229712,261797,253113 R=piman@chromium.org, zmo@chromium.org Review URL: https://codereview.chromium.org/21458003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
-rw-r--r--chrome/test/gpu/gpu_feature_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index f65f799..7ace688 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -237,8 +237,8 @@ class AcceleratedCompositingTest : public GpuFeatureTest {
}
};
-#if defined(OS_WIN) && defined(USE_AURA)
-// Compositing is always on for Windows Aura.
+#if defined(USE_AURA)
+// Compositing is always on for Aura.
#define MAYBE_AcceleratedCompositingDisabled DISABLED_AcceleratedCompositingDisabled
#else
#define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled