ui/gfx/compositor/test/test_compositor_host_mac.mm - 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/test/test_compositor_host_mac.mm

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/test/test_compositor_host_mac.mm

diff --git a/ui/gfx/compositor/test/test_compositor_host_mac.mm b/ui/gfx/compositor/test/test_compositor_host_mac.mm

index 6b905f98bcfee771679583e712dd55f1ac0da093..0a4f426b984a2d9da9938cb236c254a52a0df6a3 100644

--- a/ui/gfx/compositor/test/test_compositor_host_mac.mm

+++ b/ui/gfx/compositor/test/test_compositor_host_mac.mm

@@ -126,7 +126,7 @@ void TestCompositorHostMac::Show() {

backing:NSBackingStoreBuffered

defer:NO];

scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]);

- compositor_ = ui::Compositor::Create(this, view, bounds_.size());

+ compositor_ = new ui::Compositor(this, view, bounds_.size());

[view setCompositor:compositor_];

[window_ setContentView:view];

[window_ orderFront:nil];