diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
| commit | 207ff6675717b341d3c78d305762cd6d7a9888e1 (patch) | |
| tree | be0cd36338515ddc69935e6f2966f59b181d08aa /ui/views/view_unittest.cc | |
| parent | afaf073bb190f4e3becd8e1cd60dde6324f7ae15 (diff) | |
| download | chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.zip chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.gz chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.bz2 | |
Attempt 2 at : Makes tests either use mock compositor or mock
WebGraphicsContext3D depending upon which compositor we're
running. This is needed to enable ui tests on the bots.
I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8889022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 0fd4c21..0752eb1 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -17,8 +17,6 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/test/test_compositor.h" -#include "ui/gfx/compositor/test/test_texture.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" #include "ui/views/background.h" @@ -44,6 +42,9 @@ #if defined(USE_AURA) #include "ui/aura/root_window.h" #endif +#if !defined(USE_WEBKIT_COMPOSITOR) +#include "ui/gfx/compositor/test/test_texture.h" +#endif using ::testing::_; @@ -2531,7 +2532,9 @@ class ViewLayerTest : public ViewsTestBase { old_use_acceleration_ = View::get_use_acceleration_when_possible(); View::set_use_acceleration_when_possible(true); +#if !defined(USE_WEBKIT_COMPOSITOR) ui::TestTexture::reset_live_count(); +#endif widget_ = new Widget; Widget::InitParams params(Widget::InitParams::TYPE_POPUP); |