ui/views/view_unittest.cc - Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/view_unittest.cc

Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/views/view_unittest.cc

===================================================================

--- ui/views/view_unittest.cc (revision 113682)

+++ ui/views/view_unittest.cc (working copy)

@@ -17,6 +17,8 @@

#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"

@@ -42,9 +44,6 @@

#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::_;

@@ -2532,9 +2531,7 @@

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);

« no previous file with comments | « ui/views/run_all_unittests.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »