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

Unified Diff: cc/test/layer_tree_test.cc

Issue 2261383002: cc: Add a test for the elastic overscroll synchronization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: overflow fix. Created 4 years, 4 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 | « no previous file | cc/test/test_hooks.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 701431eb20535acbb4056d7abb3160a82a0e2bdb..19c968941d50c3dcfba19798b16f70541070a97f 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -50,12 +50,14 @@ void CreateVirtualViewportLayers(Layer* root_layer,
const gfx::Size& outer_bounds,
LayerTreeHost* host) {
scoped_refptr<Layer> inner_viewport_container_layer = Layer::Create();
+ scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create();
scoped_refptr<Layer> page_scale_layer = Layer::Create();
root_layer->AddChild(inner_viewport_container_layer);
- inner_viewport_container_layer->AddChild(page_scale_layer);
+ inner_viewport_container_layer->AddChild(overscroll_elasticity_layer);
+ overscroll_elasticity_layer->AddChild(page_scale_layer);
page_scale_layer->AddChild(inner_viewport_scroll_layer);
inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer);
outer_viewport_container_layer->AddChild(outer_scroll_layer);
@@ -72,7 +74,8 @@ void CreateVirtualViewportLayers(Layer* root_layer,
inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true);
outer_scroll_layer->SetIsContainerForFixedPositionLayers(true);
host->GetLayerTree()->RegisterViewportLayers(
- NULL, page_scale_layer, inner_viewport_scroll_layer, outer_scroll_layer);
+ overscroll_elasticity_layer, page_scale_layer,
+ inner_viewport_scroll_layer, outer_scroll_layer);
}
void CreateVirtualViewportLayers(Layer* root_layer,
@@ -175,6 +178,7 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
}
DrawResult PrepareToDraw(FrameData* frame) override {
+ test_hooks_->WillPrepareToDrawOnThread(this);
DrawResult draw_result = LayerTreeHostImpl::PrepareToDraw(frame);
return test_hooks_->PrepareToDrawOnThread(this, frame, draw_result);
}
@@ -402,10 +406,13 @@ class LayerTreeHostForTesting : public LayerTreeHost {
std::unique_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl(
LayerTreeHostImplClient* host_impl_client) override {
- return LayerTreeHostImplForTesting::Create(
- test_hooks_, settings(), host_impl_client, task_runner_provider(),
- shared_bitmap_manager(), gpu_memory_buffer_manager(),
- task_graph_runner(), rendering_stats_instrumentation());
+ std::unique_ptr<LayerTreeHostImpl> host_impl =
+ LayerTreeHostImplForTesting::Create(
+ test_hooks_, settings(), host_impl_client, task_runner_provider(),
+ shared_bitmap_manager(), gpu_memory_buffer_manager(),
+ task_graph_runner(), rendering_stats_instrumentation());
+ input_handler_weak_ptr_ = host_impl->AsWeakPtr();
+ return host_impl;
}
void SetNeedsCommit() override {
« no previous file with comments | « no previous file | cc/test/test_hooks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698