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

Unified Diff: cc/debug/micro_benchmark_controller_unittest.cc

Issue 1177033008: cc: Turn impl_side_painting and use_one_copy on in LayerTreeSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implon: fixwebkittests Created 5 years, 6 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/debug/frame_timing_tracker_unittest.cc ('k') | cc/layers/contents_scaling_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/debug/micro_benchmark_controller_unittest.cc
diff --git a/cc/debug/micro_benchmark_controller_unittest.cc b/cc/debug/micro_benchmark_controller_unittest.cc
index 87a3b42ec0b81a04f04dcc5ce62241602871e7ca..92cfc4689aac2980fe23f5c8d1729d4b61b3d571 100644
--- a/cc/debug/micro_benchmark_controller_unittest.cc
+++ b/cc/debug/micro_benchmark_controller_unittest.cc
@@ -11,6 +11,7 @@
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/fake_proxy.h"
+#include "cc/test/test_task_graph_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace cc {
@@ -23,11 +24,11 @@ class MicroBenchmarkControllerTest : public testing::Test {
void SetUp() override {
impl_proxy_ = make_scoped_ptr(new FakeImplProxy);
- shared_bitmap_manager_.reset(new TestSharedBitmapManager());
layer_tree_host_impl_ = make_scoped_ptr(new FakeLayerTreeHostImpl(
- impl_proxy_.get(), shared_bitmap_manager_.get(), nullptr));
+ impl_proxy_.get(), &shared_bitmap_manager_, &task_graph_runner_));
- layer_tree_host_ = FakeLayerTreeHost::Create(&layer_tree_host_client_);
+ layer_tree_host_ = FakeLayerTreeHost::Create(&layer_tree_host_client_,
+ &task_graph_runner_);
layer_tree_host_->SetRootLayer(Layer::Create(LayerSettings()));
layer_tree_host_->InitializeForTesting(scoped_ptr<Proxy>(new FakeProxy));
}
@@ -39,8 +40,9 @@ class MicroBenchmarkControllerTest : public testing::Test {
}
FakeLayerTreeHostClient layer_tree_host_client_;
+ TestTaskGraphRunner task_graph_runner_;
+ TestSharedBitmapManager shared_bitmap_manager_;
scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
- scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
scoped_ptr<FakeLayerTreeHostImpl> layer_tree_host_impl_;
scoped_ptr<FakeImplProxy> impl_proxy_;
};
« no previous file with comments | « cc/debug/frame_timing_tracker_unittest.cc ('k') | cc/layers/contents_scaling_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698