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

Unified Diff: cc/trees/layer_tree_impl_unittest.cc

Issue 1411663002: cc: Split Proxy to eliminate unnecessary dependencies on the impl side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update perf tests. Created 5 years, 2 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_impl.cc ('k') | cc/trees/occlusion_tracker_unittest.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 3c6a453d17d7eeb01bb86b368e17a64553acf3a5..eb2ab29583003c1125f11ba20de7007ae6ad423c 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -7,7 +7,7 @@
#include "cc/layers/heads_up_display_layer_impl.h"
#include "cc/layers/layer.h"
#include "cc/layers/solid_color_scrollbar_layer_impl.h"
-#include "cc/test/fake_impl_proxy.h"
+#include "cc/test/fake_impl_task_runner_provider.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/geometry_test_utils.h"
@@ -26,8 +26,9 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest {
LayerTreeSettings settings;
settings.layer_transforms_should_scale_layer_contents = true;
settings.verify_property_trees = true;
- host_impl_.reset(new FakeLayerTreeHostImpl(
- settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_));
+ host_impl_.reset(new FakeLayerTreeHostImpl(settings, &task_runner_provider_,
+ &shared_bitmap_manager_,
+ &task_graph_runner_));
host_impl_->SetVisible(true);
EXPECT_TRUE(host_impl_->InitializeRenderer(output_surface_.get()));
}
@@ -43,7 +44,7 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest {
private:
TestSharedBitmapManager shared_bitmap_manager_;
TestTaskGraphRunner task_graph_runner_;
- FakeImplProxy proxy_;
+ FakeImplTaskRunnerProvider task_runner_provider_;
scoped_ptr<OutputSurface> output_surface_;
scoped_ptr<FakeLayerTreeHostImpl> host_impl_;
};
@@ -97,13 +98,14 @@ TEST_F(LayerTreeImplTest, UpdateViewportAndHitTest) {
// Ensures that the viewport rect is correctly updated by the clip tree.
TestSharedBitmapManager shared_bitmap_manager;
TestTaskGraphRunner task_graph_runner;
- FakeImplProxy proxy;
+ FakeImplTaskRunnerProvider task_runner_provider;
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));
+ host_impl.reset(new FakeLayerTreeHostImpl(settings, &task_runner_provider,
+ &shared_bitmap_manager,
+ &task_graph_runner));
host_impl->SetVisible(true);
EXPECT_TRUE(host_impl->InitializeRenderer(output_surface.get()));
scoped_ptr<LayerImpl> root =
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | cc/trees/occlusion_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698