| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 parent->AddChild(scroll_layer); | 1422 parent->AddChild(scroll_layer); |
| 1423 return scroll_layer.get(); | 1423 return scroll_layer.get(); |
| 1424 } | 1424 } |
| 1425 | 1425 |
| 1426 static void SetScrollOffsetDelta(LayerImpl* layer_impl, | 1426 static void SetScrollOffsetDelta(LayerImpl* layer_impl, |
| 1427 const gfx::Vector2dF& delta) { | 1427 const gfx::Vector2dF& delta) { |
| 1428 if (layer_impl->layer_tree_impl() | 1428 if (layer_impl->layer_tree_impl() |
| 1429 ->property_trees() | 1429 ->property_trees() |
| 1430 ->scroll_tree.SetScrollOffsetDeltaForTesting(layer_impl->id(), | 1430 ->scroll_tree.SetScrollOffsetDeltaForTesting(layer_impl->id(), |
| 1431 delta)) | 1431 delta)) |
| 1432 layer_impl->layer_tree_impl()->DidUpdateScrollOffset( | 1432 layer_impl->layer_tree_impl()->DidUpdateScrollOffset(layer_impl->id()); |
| 1433 layer_impl->id(), layer_impl->transform_tree_index()); | |
| 1434 } | 1433 } |
| 1435 | 1434 |
| 1436 FakeLayerScrollClient root_scroll_layer_client_; | 1435 FakeLayerScrollClient root_scroll_layer_client_; |
| 1437 FakeLayerScrollClient sibling_scroll_layer_client_; | 1436 FakeLayerScrollClient sibling_scroll_layer_client_; |
| 1438 FakeLayerScrollClient child_scroll_layer_client_; | 1437 FakeLayerScrollClient child_scroll_layer_client_; |
| 1439 int root_scroll_layer_id_; | 1438 int root_scroll_layer_id_; |
| 1440 int sibling_scroll_layer_id_; | 1439 int sibling_scroll_layer_id_; |
| 1441 int child_scroll_layer_id_; | 1440 int child_scroll_layer_id_; |
| 1442 | 1441 |
| 1443 FakeContentLayerClient fake_content_layer_client_; | 1442 FakeContentLayerClient fake_content_layer_client_; |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1973 | 1972 |
| 1974 const gfx::Vector2dF elastic_overscroll_test_cases_[5] = { | 1973 const gfx::Vector2dF elastic_overscroll_test_cases_[5] = { |
| 1975 gfx::Vector2dF(0, 0), gfx::Vector2dF(5, 10), gfx::Vector2dF(5, 5), | 1974 gfx::Vector2dF(0, 0), gfx::Vector2dF(5, 10), gfx::Vector2dF(5, 5), |
| 1976 gfx::Vector2dF(-4, -5), gfx::Vector2dF(0, 0)}; | 1975 gfx::Vector2dF(-4, -5), gfx::Vector2dF(0, 0)}; |
| 1977 }; | 1976 }; |
| 1978 | 1977 |
| 1979 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestElasticOverscroll); | 1978 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestElasticOverscroll); |
| 1980 | 1979 |
| 1981 } // namespace | 1980 } // namespace |
| 1982 } // namespace cc | 1981 } // namespace cc |
| OLD | NEW |