Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: ui/gfx/compositor/test/test_compositor_host_linux.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/gfx/compositor/test/test_compositor_host_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/test/test_compositor_host_linux.cc
diff --git a/ui/gfx/compositor/test/test_compositor_host_linux.cc b/ui/gfx/compositor/test/test_compositor_host_linux.cc
index a13fa3a9247a4693c3dca5e5119d4832e11548a3..efaca477dcc33bde124affc47f924e11ebc6913b 100644
--- a/ui/gfx/compositor/test/test_compositor_host_linux.cc
+++ b/ui/gfx/compositor/test/test_compositor_host_linux.cc
@@ -80,7 +80,7 @@ void TestCompositorHostLinux::Show() {
if (event.type == MapNotify && event.xmap.window == window_)
break;
}
- compositor_ = ui::Compositor::Create(this, window_, bounds_.size());
+ compositor_ = new ui::Compositor(this, window_, bounds_.size());
}
ui::Compositor* TestCompositorHostLinux::GetCompositor() {
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/gfx/compositor/test/test_compositor_host_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698