| 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/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 outer_scroll_layer->SetScrollClipLayerId( | 62 outer_scroll_layer->SetScrollClipLayerId( |
| 63 outer_viewport_container_layer->id()); | 63 outer_viewport_container_layer->id()); |
| 64 | 64 |
| 65 inner_viewport_container_layer->SetBounds(inner_bounds); | 65 inner_viewport_container_layer->SetBounds(inner_bounds); |
| 66 inner_viewport_scroll_layer->SetBounds(outer_bounds); | 66 inner_viewport_scroll_layer->SetBounds(outer_bounds); |
| 67 outer_viewport_container_layer->SetBounds(outer_bounds); | 67 outer_viewport_container_layer->SetBounds(outer_bounds); |
| 68 | 68 |
| 69 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); | 69 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); |
| 70 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true); | 70 outer_scroll_layer->SetIsContainerForFixedPositionLayers(true); |
| 71 host->RegisterViewportLayers(overscroll_elasticity_layer, page_scale_layer, | 71 host->RegisterViewportLayers(overscroll_elasticity_layer, page_scale_layer, |
| 72 inner_viewport_container_layer, |
| 73 outer_viewport_container_layer, |
| 72 inner_viewport_scroll_layer, outer_scroll_layer); | 74 inner_viewport_scroll_layer, outer_scroll_layer); |
| 73 } | 75 } |
| 74 | 76 |
| 75 void CreateVirtualViewportLayers(Layer* root_layer, | 77 void CreateVirtualViewportLayers(Layer* root_layer, |
| 76 const gfx::Size& inner_bounds, | 78 const gfx::Size& inner_bounds, |
| 77 const gfx::Size& outer_bounds, | 79 const gfx::Size& outer_bounds, |
| 78 const gfx::Size& scroll_bounds, | 80 const gfx::Size& scroll_bounds, |
| 79 LayerTreeHost* host) { | 81 LayerTreeHost* host) { |
| 80 scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create(); | 82 scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create(); |
| 81 | 83 |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 DCHECK(task_runner_provider()->IsMainThread() || | 902 DCHECK(task_runner_provider()->IsMainThread() || |
| 901 task_runner_provider()->IsMainThreadBlocked()); | 903 task_runner_provider()->IsMainThreadBlocked()); |
| 902 return layer_tree_host_.get(); | 904 return layer_tree_host_.get(); |
| 903 } | 905 } |
| 904 | 906 |
| 905 Proxy* LayerTreeTest::proxy() { | 907 Proxy* LayerTreeTest::proxy() { |
| 906 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; | 908 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; |
| 907 } | 909 } |
| 908 | 910 |
| 909 } // namespace cc | 911 } // namespace cc |
| OLD | NEW |