| 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/layer.h" | 8 #include "cc/layers/layer.h" |
| 9 #include "cc/layers/layer_impl.h" | 9 #include "cc/layers/layer_impl.h" |
| 10 #include "cc/layers/picture_layer.h" | 10 #include "cc/layers/picture_layer.h" |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 base::MessageLoopProxy::current(), | 1114 base::MessageLoopProxy::current(), |
| 1115 impl_thread.message_loop_proxy()); | 1115 impl_thread.message_loop_proxy()); |
| 1116 | 1116 |
| 1117 impl_thread.message_loop_proxy() | 1117 impl_thread.message_loop_proxy() |
| 1118 ->PostTask(FROM_HERE, | 1118 ->PostTask(FROM_HERE, |
| 1119 base::Bind(&BindInputHandlerOnCompositorThread, | 1119 base::Bind(&BindInputHandlerOnCompositorThread, |
| 1120 layer_tree_host->GetInputHandler(), | 1120 layer_tree_host->GetInputHandler(), |
| 1121 base::Unretained(&input_handler_client))); | 1121 base::Unretained(&input_handler_client))); |
| 1122 | 1122 |
| 1123 layer_tree_host->DidStopFlinging(); | 1123 layer_tree_host->DidStopFlinging(); |
| 1124 layer_tree_host.reset(); | 1124 layer_tree_host = nullptr; |
| 1125 impl_thread.Stop(); | 1125 impl_thread.Stop(); |
| 1126 EXPECT_TRUE(received_stop_flinging); | 1126 EXPECT_TRUE(received_stop_flinging); |
| 1127 } | 1127 } |
| 1128 | 1128 |
| 1129 class LayerTreeHostScrollTestLayerStructureChange | 1129 class LayerTreeHostScrollTestLayerStructureChange |
| 1130 : public LayerTreeHostScrollTest { | 1130 : public LayerTreeHostScrollTest { |
| 1131 public: | 1131 public: |
| 1132 LayerTreeHostScrollTestLayerStructureChange() | 1132 LayerTreeHostScrollTestLayerStructureChange() |
| 1133 : scroll_destroy_whole_tree_(false) {} | 1133 : scroll_destroy_whole_tree_(false) {} |
| 1134 | 1134 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1215 RunTest(true, false, true); | 1215 RunTest(true, false, true); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1218 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
| 1219 scroll_destroy_whole_tree_ = true; | 1219 scroll_destroy_whole_tree_ = true; |
| 1220 RunTest(true, false, true); | 1220 RunTest(true, false, true); |
| 1221 } | 1221 } |
| 1222 | 1222 |
| 1223 } // namespace | 1223 } // namespace |
| 1224 } // namespace cc | 1224 } // namespace cc |
| OLD | NEW |