| 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/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "cc/layers/content_layer.h" | 8 #include "cc/layers/content_layer.h" |
| 9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
| 10 #include "cc/layers/layer_impl.h" | 10 #include "cc/layers/layer_impl.h" |
| (...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 if (!task_runner_->BelongsToCurrentThread()) | 1081 if (!task_runner_->BelongsToCurrentThread()) |
| 1082 ADD_FAILURE() << "Animate called on wrong thread"; | 1082 ADD_FAILURE() << "Animate called on wrong thread"; |
| 1083 } | 1083 } |
| 1084 | 1084 |
| 1085 virtual void MainThreadHasStoppedFlinging() OVERRIDE { | 1085 virtual void MainThreadHasStoppedFlinging() OVERRIDE { |
| 1086 if (!task_runner_->BelongsToCurrentThread()) | 1086 if (!task_runner_->BelongsToCurrentThread()) |
| 1087 ADD_FAILURE() << "MainThreadHasStoppedFlinging called on wrong thread"; | 1087 ADD_FAILURE() << "MainThreadHasStoppedFlinging called on wrong thread"; |
| 1088 *received_stop_flinging_ = true; | 1088 *received_stop_flinging_ = true; |
| 1089 } | 1089 } |
| 1090 | 1090 |
| 1091 virtual void DidOverscroll(const gfx::Vector2dF& accumulated_overscroll, | 1091 virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE { |
| 1092 const gfx::Vector2dF& latest_overscroll_delta) | |
| 1093 OVERRIDE { | |
| 1094 if (!task_runner_->BelongsToCurrentThread()) | 1092 if (!task_runner_->BelongsToCurrentThread()) |
| 1095 ADD_FAILURE() << "DidOverscroll called on wrong thread"; | 1093 ADD_FAILURE() << "DidOverscroll called on wrong thread"; |
| 1096 } | 1094 } |
| 1097 | 1095 |
| 1098 private: | 1096 private: |
| 1099 base::SingleThreadTaskRunner* task_runner_; | 1097 base::SingleThreadTaskRunner* task_runner_; |
| 1100 bool* received_stop_flinging_; | 1098 bool* received_stop_flinging_; |
| 1101 }; | 1099 }; |
| 1102 | 1100 |
| 1103 void BindInputHandlerOnCompositorThread( | 1101 void BindInputHandlerOnCompositorThread( |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1228 RunTest(true, false, false); | 1226 RunTest(true, false, false); |
| 1229 } | 1227 } |
| 1230 | 1228 |
| 1231 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1229 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
| 1232 scroll_destroy_whole_tree_ = true; | 1230 scroll_destroy_whole_tree_ = true; |
| 1233 RunTest(true, false, false); | 1231 RunTest(true, false, false); |
| 1234 } | 1232 } |
| 1235 | 1233 |
| 1236 } // namespace | 1234 } // namespace |
| 1237 } // namespace cc | 1235 } // namespace cc |
| OLD | NEW |