OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/message_loop/message_loop_proxy.h" | 6 #include "base/message_loop/message_loop_proxy.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "content/browser/gpu/gpu_data_manager_impl.h" | 9 #include "content/browser/gpu/gpu_data_manager_impl.h" |
10 #include "content/browser/renderer_host/render_widget_host_impl.h" | 10 #include "content/browser/renderer_host/render_widget_host_impl.h" |
11 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" | 11 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" |
12 #include "content/port/browser/render_widget_host_view_port.h" | 12 #include "content/port/browser/render_widget_host_view_port.h" |
13 #include "content/public/browser/compositor_util.h" | 13 #include "content/public/browser/compositor_util.h" |
14 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
16 #include "content/public/common/content_paths.h" | 16 #include "content/public/common/content_paths.h" |
17 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
18 #include "content/shell/shell.h" | 18 #include "content/shell/shell.h" |
19 #include "content/test/content_browser_test.h" | 19 #include "content/test/content_browser_test.h" |
20 #include "content/test/content_browser_test_utils.h" | 20 #include "content/test/content_browser_test_utils.h" |
21 #include "media/base/video_frame.h" | 21 #include "media/base/video_frame.h" |
22 #include "net/base/net_util.h" | 22 #include "net/base/net_util.h" |
23 #include "ui/compositor/compositor_setup.h" | 23 #include "ui/compositor/compositor_setup.h" |
| 24 |
24 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
25 #include "ui/surface/io_surface_support_mac.h" | 26 #include "ui/gl/io_surface_support_mac.h" |
26 #endif | 27 #endif |
27 | 28 |
28 namespace content { | 29 namespace content { |
29 namespace { | 30 namespace { |
30 | 31 |
31 // Convenience macro: Short-cicuit a pass for the tests where platform support | 32 // Convenience macro: Short-cicuit a pass for the tests where platform support |
32 // for forced-compositing mode (or disabled-compositing mode) is lacking. | 33 // for forced-compositing mode (or disabled-compositing mode) is lacking. |
33 #define SET_UP_SURFACE_OR_PASS_TEST() \ | 34 #define SET_UP_SURFACE_OR_PASS_TEST() \ |
34 if (!SetUpSourceSurface()) { \ | 35 if (!SetUpSourceSurface()) { \ |
35 LOG(WARNING) \ | 36 LOG(WARNING) \ |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 run_loop.Run(); | 415 run_loop.Run(); |
415 | 416 |
416 EXPECT_EQ(2, callback_invoke_count()); | 417 EXPECT_EQ(2, callback_invoke_count()); |
417 EXPECT_EQ(2, frames_captured()); | 418 EXPECT_EQ(2, frames_captured()); |
418 } | 419 } |
419 | 420 |
420 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 421 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
421 | 422 |
422 } // namespace | 423 } // namespace |
423 } // namespace content | 424 } // namespace content |
OLD | NEW |