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

Unified Diff: cc/test/fake_layer_tree_host_impl.cc

Issue 1365793003: cc: Re-enable disabled tile manager unittests (plus fixes) (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/test/fake_layer_tree_host_impl.h ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_layer_tree_host_impl.cc
diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc
index fba9a99dce297f01d0e5386c677521a1a26c5236..e210a76e63c127b591df9eb4cb8d5c5adbf4b8cb 100644
--- a/cc/test/fake_layer_tree_host_impl.cc
+++ b/cc/test/fake_layer_tree_host_impl.cc
@@ -12,38 +12,39 @@ namespace cc {
FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(Proxy* proxy,
SharedBitmapManager* manager,
TaskGraphRunner* task_graph_runner)
- : LayerTreeHostImpl(LayerTreeSettings(),
- &client_,
- proxy,
- &stats_instrumentation_,
- manager,
- NULL,
- task_graph_runner,
- 0) {
- // Explicitly clear all debug settings.
- SetDebugState(LayerTreeDebugState());
- SetViewportSize(gfx::Size(100, 100));
-
- // Start an impl frame so tests have a valid frame_time to work with.
- base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1);
- WillBeginImplFrame(
- CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
-}
+ : FakeLayerTreeHostImpl(LayerTreeSettings(),
+ proxy,
+ manager,
+ task_graph_runner,
+ nullptr) {}
FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(const LayerTreeSettings& settings,
Proxy* proxy,
SharedBitmapManager* manager,
TaskGraphRunner* task_graph_runner)
+ : FakeLayerTreeHostImpl(settings,
+ proxy,
+ manager,
+ task_graph_runner,
+ nullptr) {}
+
+FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(
+ const LayerTreeSettings& settings,
+ Proxy* proxy,
+ SharedBitmapManager* manager,
+ TaskGraphRunner* task_graph_runner,
+ gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
: LayerTreeHostImpl(settings,
&client_,
proxy,
&stats_instrumentation_,
manager,
- NULL,
+ gpu_memory_buffer_manager,
task_graph_runner,
0) {
// Explicitly clear all debug settings.
SetDebugState(LayerTreeDebugState());
+ SetViewportSize(gfx::Size(100, 100));
// Start an impl frame so tests have a valid frame_time to work with.
base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1);
« no previous file with comments | « cc/test/fake_layer_tree_host_impl.h ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698