diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 22:39:45 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 22:39:45 +0000 |
| commit | fe9d23f2c945bd2cfa39f5893b5e2f000dd6baf3 (patch) | |
| tree | af22261fc6fab81379e571eb9fa42237f2ab0e2f /ui/aura_shell | |
| parent | a13da216e3642f8b35e1a95e09974bf144ff3f17 (diff) | |
| download | chromium_src-fe9d23f2c945bd2cfa39f5893b5e2f000dd6baf3.zip chromium_src-fe9d23f2c945bd2cfa39f5893b5e2f000dd6baf3.tar.gz chromium_src-fe9d23f2c945bd2cfa39f5893b5e2f000dd6baf3.tar.bz2 | |
Use WebKit compositor in ui::Layer
BUG=99524
TEST=compositor_unittests
Review URL: http://codereview.chromium.org/8222028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 2 | ||||
| -rw-r--r-- | ui/aura_shell/examples/aura_shell_main.cc | 4 | ||||
| -rw-r--r-- | ui/aura_shell/test_suite.cc | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index 637534b..8fef1ec 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -73,6 +73,7 @@ '../../third_party/icu/icu.gyp:icuuc', '../../views/views.gyp:views', '../gfx/compositor/compositor.gyp:compositor', + '../gfx/compositor/compositor.gyp:compositor_test_support', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -110,6 +111,7 @@ '../../views/views.gyp:views', '../aura/aura.gyp:aura', '../gfx/compositor/compositor.gyp:compositor', + '../gfx/compositor/compositor.gyp:compositor_test_support', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc index 486554b..414bcdd 100644 --- a/ui/aura_shell/examples/aura_shell_main.cc +++ b/ui/aura_shell/examples/aura_shell_main.cc @@ -15,6 +15,7 @@ #include "ui/aura_shell/shell_factory.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/compositor/compositor_test_support.h" namespace { @@ -69,6 +70,7 @@ 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_shell::Shell::GetInstance()->SetDelegate(new ShellDelegateImpl);; @@ -78,6 +80,8 @@ int main(int argc, char** argv) { delete aura::Desktop::GetInstance(); + ui::CompositorTestSupport::Terminate(); + return 0; } diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc index 2652a24..5ccb18f 100644 --- a/ui/aura_shell/test_suite.cc +++ b/ui/aura_shell/test_suite.cc @@ -9,6 +9,7 @@ #include "build/build_config.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/compositor/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.h" @@ -27,9 +28,11 @@ void AuraShellTestSuite::Initialize() { // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. ui::ResourceBundle::InitSharedInstance("en-US"); + ui::CompositorTestSupport::Initialize(); } void AuraShellTestSuite::Shutdown() { + ui::CompositorTestSupport::Terminate(); ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); |