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

Unified Diff: ui/compositor/layer_unittest.cc

Issue 277713002: ui/compositor: move the browser compositor thread to the ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix includes 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/in_process_context_factory.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 52051c1cb00ee4e8624624cf98569924ef825aed..01b93aa3f5b0c6fe63eab888654ac170031d746e 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -91,7 +91,6 @@ class LayerWithRealCompositorTest : public testing::Test {
virtual void SetUp() OVERRIDE {
bool enable_pixel_output = true;
InitializeContextFactoryForTests(enable_pixel_output);
- Compositor::Initialize();
const gfx::Rect host_bounds(10, 10, 500, 500);
compositor_host_.reset(TestCompositorHost::Create(host_bounds));
@@ -101,7 +100,6 @@ class LayerWithRealCompositorTest : public testing::Test {
virtual void TearDown() OVERRIDE {
compositor_host_.reset();
TerminateContextFactoryForTests();
- Compositor::Terminate();
}
Compositor* GetCompositor() { return compositor_host_->GetCompositor(); }
@@ -400,7 +398,6 @@ class LayerWithDelegateTest : public testing::Test {
virtual void SetUp() OVERRIDE {
bool enable_pixel_output = false;
InitializeContextFactoryForTests(enable_pixel_output);
- Compositor::Initialize();
const gfx::Rect host_bounds(1000, 1000);
compositor_host_.reset(TestCompositorHost::Create(host_bounds));
@@ -410,7 +407,6 @@ class LayerWithDelegateTest : public testing::Test {
virtual void TearDown() OVERRIDE {
compositor_host_.reset();
TerminateContextFactoryForTests();
- Compositor::Terminate();
}
Compositor* compositor() { return compositor_host_->GetCompositor(); }
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698