diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 14:20:31 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 14:20:31 +0000 |
| commit | 2d7b0872c81343917c37914863d47f429b3a5b68 (patch) | |
| tree | 6d1f7cc551e53d2626ff522ec46adb18da6c991c /ui/aura | |
| parent | 5c975ed62853fee34c8600cd47138816ee936fe0 (diff) | |
| download | chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.zip chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.tar.gz chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.tar.bz2 | |
Revert 107563 - Fix up compositor mocking.
Two changes:
a) detangle the mock compositor from compositor_test_support
a) pull in compositor when using a mock compositor
Rationale:
a) this target was meant to support using use_webkit_compositor=1 when WK isn't initialized; sometimes we will want to use the mock compositor when WK is initialized
b) we can imagine scenarios where we want to switch between mock and real compositors in the same executable, and it's one less target to update
BUG=101477
TEST=bots stay green
Review URL: http://codereview.chromium.org/8395043
TBR=backer@chromium.org
Review URL: http://codereview.chromium.org/8404041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/aura.gyp | 3 | ||||
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 5 | ||||
| -rw-r--r-- | ui/aura/test/test_suite.cc | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 4e453c2..a1d8704 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -89,7 +89,6 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../gfx/compositor/compositor.gyp:compositor', - '../gfx/compositor/compositor.gyp:compositor_test_support', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -111,8 +110,8 @@ '../../base/base.gyp:test_support_base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../gfx/compositor/compositor.gyp:compositor', '../gfx/compositor/compositor.gyp:compositor_test_support', - '../gfx/compositor/compositor.gyp:test_compositor', '../gfx/gl/gl.gyp:gl', '../ui.gyp:gfx_resources', '../ui.gyp:ui', diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index 61d7d7a..5c64b0c 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -16,7 +16,6 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/gfx/canvas_skia.h" -#include "ui/gfx/compositor/compositor_test_support.h" #include "ui/gfx/rect.h" #if defined(USE_X11) @@ -82,7 +81,6 @@ int main(int argc, char** argv) { // Create the message-loop here before creating the desktop. MessageLoop message_loop(MessageLoop::TYPE_UI); - ui::CompositorTestSupport::Initialize(); aura::Desktop::GetInstance(); @@ -112,9 +110,6 @@ int main(int argc, char** argv) { window3.SetParent(&window2); aura::Desktop::GetInstance()->Run(); - - ui::CompositorTestSupport::Terminate(); - return 0; } diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index 10cef93..4c4faa6 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -12,7 +12,6 @@ #include "ui/gfx/compositor/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/test/gfx_test_utils.h" namespace aura { namespace test { @@ -30,7 +29,7 @@ void AuraTestSuite::Initialize() { // output, it'll pass regardless of the system language. ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); - ui::gfx_test_utils::SetupTestCompositor(); + ui::CompositorTestSupport::SetupMockCompositor(); } void AuraTestSuite::Shutdown() { |