diff options
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 12 | ||||
| -rw-r--r-- | ui/aura_shell/test_suite.cc | 9 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index 2e1d430..fc4f0d1 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -135,7 +135,6 @@ '../aura/aura.gyp:aura', '../aura/aura.gyp:test_support_aura', '../gfx/compositor/compositor.gyp:compositor_test_support', - '../gfx/compositor/compositor.gyp:test_compositor', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -170,6 +169,17 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], + 'conditions': [ + ['use_webkit_compositor==1', { + 'dependencies': [ + '../gfx/compositor/compositor.gyp:compositor', + ], + }, { # use_webkit_compositor!=1 + 'dependencies': [ + '../gfx/compositor/compositor.gyp:test_compositor', + ], + }], + ], }, { 'target_name': 'aura_shell_exe', diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc index d1168b9..3c1eab9 100644 --- a/ui/aura_shell/test_suite.cc +++ b/ui/aura_shell/test_suite.cc @@ -11,7 +11,12 @@ #include "ui/base/ui_base_paths.h" #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 aura_shell { namespace test { @@ -29,7 +34,11 @@ 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() { |