diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 12:48:03 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 12:48:03 +0000 |
| commit | c6933fcf7d7d3d13a0b9fb7ee2c6c59406d60003 (patch) | |
| tree | be2d4459fc9e0c3fa8ba1c222494991af2424592 /ui/aura/test/aura_test_base.cc | |
| parent | d251633833d12a8fa5030df91261a015f1812b5a (diff) | |
| download | chromium_src-c6933fcf7d7d3d13a0b9fb7ee2c6c59406d60003.zip chromium_src-c6933fcf7d7d3d13a0b9fb7ee2c6c59406d60003.tar.gz chromium_src-c6933fcf7d7d3d13a0b9fb7ee2c6c59406d60003.tar.bz2 | |
ui::TestCompositor::TestCompositor() constructor has been changed to take a a CompositorDelegate* as a parameter. It can be NULL to get the same behaviour as before. But some tests actually require ScheduleDraw() to cause a draw to happen, in order to test that their real delegate is doing its job. Also, we move the compositor_factory from views::Widget and aura::Desktop to ui::Compositor.
BUG=101091
TEST=bots stay green
Review URL: http://codereview.chromium.org/8240006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test/aura_test_base.cc')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index c2cff110..61ffed4 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -10,15 +10,10 @@ #include "ui/aura/desktop.h" #include "ui/aura/test/test_desktop_delegate.h" -#include "ui/gfx/compositor/test_compositor.h" namespace aura { namespace test { -static ui::Compositor* TestCreateCompositor() { - return new ui::TestCompositor(); -} - AuraTestBase::AuraTestBase() : setup_called_(false), teardown_called_(false) { @@ -26,7 +21,6 @@ AuraTestBase::AuraTestBase() OleInitialize(NULL); #endif - aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor); // TestDesktopDelegate is owned by the desktop. new TestDesktopDelegate(); Desktop::GetInstance()->Show(); @@ -50,7 +44,6 @@ AuraTestBase::~AuraTestBase() { // Ensure that we don't use the previously-allocated static Desktop object // later -- on Linux, it holds a reference to our message loop's X connection. aura::Desktop::DeleteInstanceForTesting(); - aura::Desktop::set_compositor_factory_for_testing(NULL); } void AuraTestBase::SetUp() { |