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

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « cc/test/layer_tree_json_parser.cc ('k') | cc/test/test_layer_tree_host_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create(); 54 scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create();
55 scoped_refptr<Layer> page_scale_layer = Layer::Create(); 55 scoped_refptr<Layer> page_scale_layer = Layer::Create();
56 56
57 root_layer->AddChild(inner_viewport_container_layer); 57 root_layer->AddChild(inner_viewport_container_layer);
58 inner_viewport_container_layer->AddChild(overscroll_elasticity_layer); 58 inner_viewport_container_layer->AddChild(overscroll_elasticity_layer);
59 overscroll_elasticity_layer->AddChild(page_scale_layer); 59 overscroll_elasticity_layer->AddChild(page_scale_layer);
60 page_scale_layer->AddChild(inner_viewport_scroll_layer); 60 page_scale_layer->AddChild(inner_viewport_scroll_layer);
61 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer); 61 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer);
62 outer_viewport_container_layer->AddChild(outer_scroll_layer); 62 outer_viewport_container_layer->AddChild(outer_scroll_layer);
63 63
64 inner_viewport_scroll_layer->SetScrollClipLayerId( 64 inner_viewport_scroll_layer->SetScrollClipAndCanOverscroll(
65 inner_viewport_container_layer->id()); 65 inner_viewport_container_layer->id(), false);
66 outer_scroll_layer->SetScrollClipLayerId( 66 outer_scroll_layer->SetScrollClipAndCanOverscroll(
67 outer_viewport_container_layer->id()); 67 outer_viewport_container_layer->id(), false);
68 68
69 inner_viewport_container_layer->SetBounds(inner_bounds); 69 inner_viewport_container_layer->SetBounds(inner_bounds);
70 inner_viewport_scroll_layer->SetBounds(outer_bounds); 70 inner_viewport_scroll_layer->SetBounds(outer_bounds);
71 outer_viewport_container_layer->SetBounds(outer_bounds); 71 outer_viewport_container_layer->SetBounds(outer_bounds);
72 72
73 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); 73 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true);
74 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true); 74 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true);
75 host->GetLayerTree()->RegisterViewportLayers( 75 host->GetLayerTree()->RegisterViewportLayers(
76 overscroll_elasticity_layer, page_scale_layer, 76 overscroll_elasticity_layer, page_scale_layer,
77 inner_viewport_scroll_layer, outer_scroll_layer); 77 inner_viewport_scroll_layer, outer_scroll_layer);
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 DCHECK(!IsRemoteTest()); 933 DCHECK(!IsRemoteTest());
934 return layer_tree_host_in_process_; 934 return layer_tree_host_in_process_;
935 } 935 }
936 936
937 Proxy* LayerTreeTest::proxy() { 937 Proxy* LayerTreeTest::proxy() {
938 return layer_tree_host_in_process() ? layer_tree_host_in_process()->proxy() 938 return layer_tree_host_in_process() ? layer_tree_host_in_process()->proxy()
939 : NULL; 939 : NULL;
940 } 940 }
941 941
942 } // namespace cc 942 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_json_parser.cc ('k') | cc/test/test_layer_tree_host_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698