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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "cc/content_layer.h" | 8 #include "cc/layers/content_layer.h" |
9 #include "cc/heads_up_display_layer.h" | 9 #include "cc/layers/heads_up_display_layer.h" |
10 #include "cc/io_surface_layer.h" | 10 #include "cc/layers/io_surface_layer.h" |
11 #include "cc/layer_impl.h" | 11 #include "cc/layers/layer_impl.h" |
12 #include "cc/picture_layer.h" | 12 #include "cc/layers/picture_layer.h" |
13 #include "cc/scrollbar_layer.h" | 13 #include "cc/layers/scrollbar_layer.h" |
| 14 #include "cc/layers/texture_layer.h" |
| 15 #include "cc/layers/video_layer.h" |
| 16 #include "cc/layers/video_layer_impl.h" |
14 #include "cc/test/fake_content_layer.h" | 17 #include "cc/test/fake_content_layer.h" |
15 #include "cc/test/fake_content_layer_client.h" | 18 #include "cc/test/fake_content_layer_client.h" |
16 #include "cc/test/fake_content_layer_impl.h" | 19 #include "cc/test/fake_content_layer_impl.h" |
17 #include "cc/test/fake_context_provider.h" | 20 #include "cc/test/fake_context_provider.h" |
18 #include "cc/test/fake_delegated_renderer_layer.h" | 21 #include "cc/test/fake_delegated_renderer_layer.h" |
19 #include "cc/test/fake_delegated_renderer_layer_impl.h" | 22 #include "cc/test/fake_delegated_renderer_layer_impl.h" |
20 #include "cc/test/fake_output_surface.h" | 23 #include "cc/test/fake_output_surface.h" |
21 #include "cc/test/fake_scrollbar_layer.h" | 24 #include "cc/test/fake_scrollbar_layer.h" |
22 #include "cc/test/fake_scrollbar_theme_painter.h" | 25 #include "cc/test/fake_scrollbar_theme_painter.h" |
23 #include "cc/test/fake_video_frame_provider.h" | 26 #include "cc/test/fake_video_frame_provider.h" |
24 #include "cc/test/fake_web_scrollbar.h" | 27 #include "cc/test/fake_web_scrollbar.h" |
25 #include "cc/test/fake_web_scrollbar_theme_geometry.h" | 28 #include "cc/test/fake_web_scrollbar_theme_geometry.h" |
26 #include "cc/test/layer_tree_test_common.h" | 29 #include "cc/test/layer_tree_test_common.h" |
27 #include "cc/test/render_pass_test_common.h" | 30 #include "cc/test/render_pass_test_common.h" |
28 #include "cc/test/test_web_graphics_context_3d.h" | 31 #include "cc/test/test_web_graphics_context_3d.h" |
29 #include "cc/texture_layer.h" | |
30 #include "cc/trees/layer_tree_host_impl.h" | 32 #include "cc/trees/layer_tree_host_impl.h" |
31 #include "cc/trees/layer_tree_impl.h" | 33 #include "cc/trees/layer_tree_impl.h" |
32 #include "cc/trees/single_thread_proxy.h" | 34 #include "cc/trees/single_thread_proxy.h" |
33 #include "cc/video_layer.h" | |
34 #include "cc/video_layer_impl.h" | |
35 #include "gpu/GLES2/gl2extchromium.h" | 35 #include "gpu/GLES2/gl2extchromium.h" |
36 #include "media/base/media.h" | 36 #include "media/base/media.h" |
37 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" | 37 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" |
38 | 38 |
39 using media::VideoFrame; | 39 using media::VideoFrame; |
40 using WebKit::WebGraphicsContext3D; | 40 using WebKit::WebGraphicsContext3D; |
41 | 41 |
42 namespace cc { | 42 namespace cc { |
43 namespace { | 43 namespace { |
44 | 44 |
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1229 | 1229 |
1230 private: | 1230 private: |
1231 int commits_; | 1231 int commits_; |
1232 scoped_refptr<FakeScrollbarLayer> scrollbar_layer_; | 1232 scoped_refptr<FakeScrollbarLayer> scrollbar_layer_; |
1233 }; | 1233 }; |
1234 | 1234 |
1235 SINGLE_AND_MULTI_THREAD_TEST_F(ScrollbarLayerLostContext) | 1235 SINGLE_AND_MULTI_THREAD_TEST_F(ScrollbarLayerLostContext) |
1236 | 1236 |
1237 } // namespace | 1237 } // namespace |
1238 } // namespace cc | 1238 } // namespace cc |
OLD | NEW |