| OLD | NEW |
| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create(); | 53 scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create(); |
| 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(page_scale_layer); | 58 inner_viewport_container_layer->AddChild(page_scale_layer); |
| 59 page_scale_layer->AddChild(inner_viewport_scroll_layer); | 59 page_scale_layer->AddChild(inner_viewport_scroll_layer); |
| 60 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer); | 60 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer); |
| 61 outer_viewport_container_layer->AddChild(outer_scroll_layer); | 61 outer_viewport_container_layer->AddChild(outer_scroll_layer); |
| 62 | 62 |
| 63 inner_viewport_scroll_layer->SetScrollClipLayerId( | 63 inner_viewport_scroll_layer->SetScrollClipAndCanOverscroll( |
| 64 inner_viewport_container_layer->id()); | 64 inner_viewport_container_layer->id(), false); |
| 65 outer_scroll_layer->SetScrollClipLayerId( | 65 outer_scroll_layer->SetScrollClipAndCanOverscroll( |
| 66 outer_viewport_container_layer->id()); | 66 outer_viewport_container_layer->id(), false); |
| 67 | 67 |
| 68 inner_viewport_container_layer->SetBounds(inner_bounds); | 68 inner_viewport_container_layer->SetBounds(inner_bounds); |
| 69 inner_viewport_scroll_layer->SetBounds(outer_bounds); | 69 inner_viewport_scroll_layer->SetBounds(outer_bounds); |
| 70 outer_viewport_container_layer->SetBounds(outer_bounds); | 70 outer_viewport_container_layer->SetBounds(outer_bounds); |
| 71 | 71 |
| 72 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); | 72 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); |
| 73 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true); | 73 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true); |
| 74 host->RegisterViewportLayers(NULL, page_scale_layer, | 74 host->RegisterViewportLayers(NULL, page_scale_layer, |
| 75 inner_viewport_scroll_layer, outer_scroll_layer); | 75 inner_viewport_scroll_layer, outer_scroll_layer); |
| 76 } | 76 } |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 } | 932 } |
| 933 | 933 |
| 934 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { | 934 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { |
| 935 DCHECK(IsRemoteTest()); | 935 DCHECK(IsRemoteTest()); |
| 936 DCHECK(task_runner_provider()->IsMainThread() || | 936 DCHECK(task_runner_provider()->IsMainThread() || |
| 937 task_runner_provider()->IsMainThreadBlocked()); | 937 task_runner_provider()->IsMainThreadBlocked()); |
| 938 return remote_client_layer_tree_host_.get(); | 938 return remote_client_layer_tree_host_.get(); |
| 939 } | 939 } |
| 940 | 940 |
| 941 } // namespace cc | 941 } // namespace cc |
| OLD | NEW |