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

Unified Diff: ui/compositor/layer_unittest.cc

Issue 285373012: Temporarily adds another constructor to Compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak Created 6 years, 7 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/compositor/compositor.cc ('k') | ui/compositor/test/context_factories_for_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 9224bd53c099e8526d05861087a963401cd4ff91..f216af3c2776faf1cb60f8e4506b0703f0983432 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -90,10 +90,12 @@ class LayerWithRealCompositorTest : public testing::Test {
// Overridden from testing::Test:
virtual void SetUp() OVERRIDE {
bool enable_pixel_output = true;
- InitializeContextFactoryForTests(enable_pixel_output);
+ ui::ContextFactory* context_factory =
+ InitializeContextFactoryForTests(enable_pixel_output);
const gfx::Rect host_bounds(10, 10, 500, 500);
- compositor_host_.reset(TestCompositorHost::Create(host_bounds));
+ compositor_host_.reset(TestCompositorHost::Create(
+ host_bounds, context_factory));
compositor_host_->Show();
}
@@ -397,10 +399,12 @@ class LayerWithDelegateTest : public testing::Test {
// Overridden from testing::Test:
virtual void SetUp() OVERRIDE {
bool enable_pixel_output = false;
- InitializeContextFactoryForTests(enable_pixel_output);
+ ui::ContextFactory* context_factory =
+ InitializeContextFactoryForTests(enable_pixel_output);
const gfx::Rect host_bounds(1000, 1000);
- compositor_host_.reset(TestCompositorHost::Create(host_bounds));
+ compositor_host_.reset(TestCompositorHost::Create(host_bounds,
+ context_factory));
compositor_host_->Show();
}
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/context_factories_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698