diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:25:02 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:25:02 +0000 |
| commit | 578c81bf2adf9cb973f6a8e759a81bbdf5416226 (patch) | |
| tree | d58c67c0d302abaa157d1f94a6f80f964b9b6294 /ash | |
| parent | a0e1adc59387bb3560c3b36c64a180fc4ff9eab7 (diff) | |
| download | chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.zip chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.tar.gz chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.tar.bz2 | |
Remove old (pre-webkit) compositor
BUG=103948
TEST=builds, tests pass
Review URL: http://codereview.chromium.org/9288053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 10 | ||||
| -rw-r--r-- | ash/test/test_suite.cc | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index f78a021..e8fbe4d 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -190,6 +190,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:test_support_aura', + '../ui/gfx/compositor/compositor.gyp:compositor', '../ui/gfx/compositor/compositor.gyp:compositor_test_support', '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui', @@ -242,15 +243,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], 'conditions': [ - ['use_webkit_compositor==1', { - 'dependencies': [ - '../ui/gfx/compositor/compositor.gyp:compositor', - ], - }, { # use_webkit_compositor!=1 - 'dependencies': [ - '../ui/gfx/compositor/compositor.gyp:test_compositor', - ], - }], ['use_ibus==1', { 'dependencies': [ '../build/linux/system.gyp:ibus', diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index f3ebe9b..9bb0835 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,11 +12,7 @@ #include "ui/gfx/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" -#if defined(USE_WEBKIT_COMPOSITOR) #include "ui/gfx/compositor/compositor_setup.h" -#else -#include "ui/gfx/test/gfx_test_utils.h" -#endif namespace ash { namespace test { @@ -34,11 +30,7 @@ void AuraShellTestSuite::Initialize() { // output, it'll pass regardless of the system language. ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); -#if defined(USE_WEBKIT_COMPOSITOR) ui::SetupTestCompositor(); -#else - ui::gfx_test_utils::SetupTestCompositor(); -#endif } void AuraShellTestSuite::Shutdown() { |