| 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/base/thread_impl.h" | 8 #include "cc/base/thread_impl.h" |
| 9 #include "cc/layers/content_layer.h" | 9 #include "cc/layers/content_layer.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| 11 #include "cc/layers/layer_impl.h" | 11 #include "cc/layers/layer_impl.h" |
| 12 #include "cc/test/fake_content_layer_client.h" | 12 #include "cc/test/fake_content_layer_client.h" |
| 13 #include "cc/test/fake_layer_tree_host_client.h" | 13 #include "cc/test/fake_layer_tree_host_client.h" |
| 14 #include "cc/test/geometry_test_utils.h" | 14 #include "cc/test/geometry_test_utils.h" |
| 15 #include "cc/test/layer_tree_test.h" | 15 #include "cc/test/layer_tree_test.h" |
| 16 #include "cc/trees/layer_tree_impl.h" | 16 #include "cc/trees/layer_tree_impl.h" |
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClien
t.h" | 17 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h" |
| 18 #include "ui/gfx/point_conversions.h" | 18 #include "ui/gfx/point_conversions.h" |
| 19 #include "ui/gfx/size_conversions.h" | 19 #include "ui/gfx/size_conversions.h" |
| 20 #include "ui/gfx/vector2d_conversions.h" | 20 #include "ui/gfx/vector2d_conversions.h" |
| 21 | 21 |
| 22 namespace cc { | 22 namespace cc { |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 class LayerTreeHostScrollTest : public LayerTreeTest {}; | 25 class LayerTreeHostScrollTest : public LayerTreeTest {}; |
| 26 | 26 |
| 27 class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest { | 27 class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest { |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 base::Unretained(&input_handler_client))); | 748 base::Unretained(&input_handler_client))); |
| 749 | 749 |
| 750 layer_tree_host->DidStopFlinging(); | 750 layer_tree_host->DidStopFlinging(); |
| 751 layer_tree_host.reset(); | 751 layer_tree_host.reset(); |
| 752 impl_thread.Stop(); | 752 impl_thread.Stop(); |
| 753 EXPECT_TRUE(received_stop_flinging); | 753 EXPECT_TRUE(received_stop_flinging); |
| 754 } | 754 } |
| 755 | 755 |
| 756 } // namespace | 756 } // namespace |
| 757 } // namespace cc | 757 } // namespace cc |
| OLD | NEW |