ui/gfx/compositor/test_compositor.cc - Issue 8240006: Use a mocked compositor for unit tests

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/test_compositor.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 9 years, 2 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/test_compositor.cc

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

index 311a9239b6c27ed4e1a07712803aafa3109c74d4..1c7f79ec8f7f9d727b9052fbb9ab34fe6ac4b81a 100644

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

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

@@ -19,9 +19,11 @@ class TestCompositorDelegate : public ui::CompositorDelegate {

DISALLOW_COPY_AND_ASSIGN(TestCompositorDelegate);

};

-TestCompositor::TestCompositor()

- : Compositor(new TestCompositorDelegate, gfx::Size(100, 100)) {

- owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));

+TestCompositor::TestCompositor(CompositorDelegate *owner)

+ : Compositor((owner ? owner : new TestCompositorDelegate),

+ gfx::Size(100, 100)) {

+ if (!owner)

+ owned_delegate_.reset(static_cast<TestCompositorDelegate*>(delegate()));

}

TestCompositor::~TestCompositor() {