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 /content/test | |
| 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 'content/test')
| -rw-r--r-- | content/test/content_test_suite.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index c962fb3..1307aaa 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -13,6 +13,7 @@ #include "content/test/test_content_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/compositor/compositor_test_support.h" namespace { @@ -65,6 +66,9 @@ void ContentTestSuite::Initialize() { content::RegisterPathProvider(); ui::RegisterPathProvider(); + // Mock out the compositor on platforms that use it. + ui::CompositorTestSupport::SetupMockCompositor(); + testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners(); listeners.Append(new TestContentClientInitializer); |