diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 03:22:13 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 03:22:13 +0000 |
| commit | 4466cbde3ee2d518081872862e3cfe741731540e (patch) | |
| tree | 60fe5f3552774bb90ca2dc20b68d9a71574d8291 /content | |
| parent | bfe3010dd8c3dfc7a62d791bacdc51569ca94055 (diff) | |
| download | chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.zip chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.tar.gz chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.tar.bz2 | |
Revert 118789 - Always use webkit compositor
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/9141034
TBR=piman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9283008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_tests.gypi | 2 | ||||
| -rw-r--r-- | content/test/content_test_suite.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 19c6035..2e3e4b5 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -135,7 +135,7 @@ '../build/linux/system.gyp:glib', ], }], - ['use_webkit_compositor==1 and views_compositor==1', { + ['use_webkit_compositor==1', { 'dependencies': [ '../ui/gfx/compositor/compositor.gyp:compositor', ], diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index e1cecd9..ef67f6d 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -89,4 +89,3 @@ void ContentTestSuite::Initialize() { testing::UnitTest::GetInstance()->listeners(); listeners.Append(new TestContentClientInitializer); } - |