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

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

Issue 2189583004: [not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Combined rebase 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 unified diff | Download patch
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> inner_viewport_scroll_layer = Layer::Create(); 54 scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
55 scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create(); 55 scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create();
56 scoped_refptr<Layer> page_scale_layer = Layer::Create(); 56 scoped_refptr<Layer> page_scale_layer = Layer::Create();
57 57
58 root_layer->AddChild(inner_viewport_container_layer); 58 root_layer->AddChild(inner_viewport_container_layer);
59 inner_viewport_container_layer->AddChild(page_scale_layer); 59 inner_viewport_container_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->RegisterViewportLayers(NULL, page_scale_layer, 75 host->RegisterViewportLayers(NULL, page_scale_layer,
76 inner_viewport_scroll_layer, outer_scroll_layer); 76 inner_viewport_scroll_layer, outer_scroll_layer);
77 } 77 }
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 } 935 }
936 936
937 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { 937 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
938 DCHECK(IsRemoteTest()); 938 DCHECK(IsRemoteTest());
939 DCHECK(task_runner_provider()->IsMainThread() || 939 DCHECK(task_runner_provider()->IsMainThread() ||
940 task_runner_provider()->IsMainThreadBlocked()); 940 task_runner_provider()->IsMainThreadBlocked());
941 return remote_client_layer_tree_host_.get(); 941 return remote_client_layer_tree_host_.get();
942 } 942 }
943 943
944 } // namespace cc 944 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698