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

Unified Diff: cc/trees/layer_tree_impl_unittest.cc

Issue 1356463002: Revert of cc: Implement shared worker contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/occlusion_tracker_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl_unittest.cc
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 05f873a456945b302e2c5688b46c421a0568dc11..ce05e1beb559d079fa9d6dacc75a84edf7236af1 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -22,12 +22,12 @@
class LayerTreeImplTest : public LayerTreeHostCommonTest {
public:
- LayerTreeImplTest() : output_surface_(FakeOutputSurface::Create3d()) {
+ LayerTreeImplTest() {
LayerTreeSettings settings;
settings.layer_transforms_should_scale_layer_contents = true;
host_impl_.reset(new FakeLayerTreeHostImpl(
settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_));
- EXPECT_TRUE(host_impl_->InitializeRenderer(output_surface_.get()));
+ EXPECT_TRUE(host_impl_->InitializeRenderer(FakeOutputSurface::Create3d()));
}
FakeLayerTreeHostImpl& host_impl() { return *host_impl_; }
@@ -42,7 +42,6 @@
TestSharedBitmapManager shared_bitmap_manager_;
TestTaskGraphRunner task_graph_runner_;
FakeImplProxy proxy_;
- scoped_ptr<OutputSurface> output_surface_;
scoped_ptr<FakeLayerTreeHostImpl> host_impl_;
};
@@ -98,11 +97,10 @@
FakeImplProxy proxy;
LayerTreeSettings settings;
settings.verify_property_trees = true;
- scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d();
scoped_ptr<FakeLayerTreeHostImpl> host_impl;
host_impl.reset(new FakeLayerTreeHostImpl(
settings, &proxy, &shared_bitmap_manager, &task_graph_runner));
- EXPECT_TRUE(host_impl->InitializeRenderer(output_surface.get()));
+ EXPECT_TRUE(host_impl->InitializeRenderer(FakeOutputSurface::Create3d()));
scoped_ptr<LayerImpl> root =
LayerImpl::Create(host_impl->active_tree(), 12345);
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/occlusion_tracker_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698