ui/gfx/compositor/layer_unittest.cc - Issue 9297041: Merge Compositor and CompositorCC

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/gfx/compositor/layer_unittest.cc

Issue 9297041: Merge Compositor and CompositorCC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 11 months ago

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

Jump to:

Index: ui/gfx/compositor/layer_unittest.cc

diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc

index 4f4cfe47ba5c3bdf4484326311d2e0fcb7170476..8accd0bdfb58239283a1e3d32e449088d9a91395 100644

--- a/ui/gfx/compositor/layer_unittest.cc

+++ b/ui/gfx/compositor/layer_unittest.cc

@@ -362,7 +362,7 @@ class LayerWithDelegateTest : public testing::Test, public CompositorDelegate {

// Overridden from testing::Test:

virtual void SetUp() OVERRIDE {

ui::SetupTestCompositor();

- compositor_ = ui::Compositor::Create(this, NULL, gfx::Size(1000, 1000));

+ compositor_ = new ui::Compositor(this, NULL, gfx::Size(1000, 1000));

}

virtual void TearDown() OVERRIDE {

« no previous file with comments | « ui/gfx/compositor/layer.cc ('k') | ui/gfx/compositor/test/test_compositor_host_linux.cc » ('j') | no next file with comments »