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/compositor_util.h" | 9 #include "content/browser/gpu/compositor_util.h" |
10 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "media/filters/skcanvas_video_renderer.h" | 26 #include "media/filters/skcanvas_video_renderer.h" |
27 #include "net/base/filename_util.h" | 27 #include "net/base/filename_util.h" |
28 #include "third_party/skia/include/core/SkBitmap.h" | 28 #include "third_party/skia/include/core/SkBitmap.h" |
29 #include "third_party/skia/include/core/SkCanvas.h" | 29 #include "third_party/skia/include/core/SkCanvas.h" |
30 #include "ui/base/layout.h" | 30 #include "ui/base/layout.h" |
31 #include "ui/base/ui_base_switches.h" | 31 #include "ui/base/ui_base_switches.h" |
32 #include "ui/gfx/size_conversions.h" | 32 #include "ui/gfx/size_conversions.h" |
33 #include "ui/gfx/switches.h" | 33 #include "ui/gfx/switches.h" |
34 #include "ui/gl/gl_switches.h" | 34 #include "ui/gl/gl_switches.h" |
35 | 35 |
36 #if defined(OS_MACOSX) | |
37 #include "ui/gl/io_surface_support_mac.h" | |
38 #endif | |
39 | |
40 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
41 #include "base/win/windows_version.h" | 37 #include "base/win/windows_version.h" |
42 #include "ui/gfx/win/dpi.h" | 38 #include "ui/gfx/win/dpi.h" |
43 #endif | 39 #endif |
44 | 40 |
45 namespace content { | 41 namespace content { |
46 namespace { | 42 namespace { |
47 | 43 |
48 // Convenience macro: Short-circuit a pass for the tests where platform support | 44 // Convenience macro: Short-circuit a pass for the tests where platform support |
49 // for forced-compositing mode (or disabled-compositing mode) is lacking. | 45 // for forced-compositing mode (or disabled-compositing mode) is lacking. |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 UseSoftwareCompositing(); | 212 UseSoftwareCompositing(); |
217 RenderWidgetHostViewBrowserTest::SetUp(); | 213 RenderWidgetHostViewBrowserTest::SetUp(); |
218 } | 214 } |
219 | 215 |
220 virtual GURL TestUrl() { | 216 virtual GURL TestUrl() { |
221 return net::FilePathToFileURL( | 217 return net::FilePathToFileURL( |
222 test_dir().AppendASCII("rwhv_compositing_animation.html")); | 218 test_dir().AppendASCII("rwhv_compositing_animation.html")); |
223 } | 219 } |
224 | 220 |
225 virtual bool SetUpSourceSurface(const char* wait_message) OVERRIDE { | 221 virtual bool SetUpSourceSurface(const char* wait_message) OVERRIDE { |
226 #if defined(OS_MACOSX) | |
227 CHECK(IOSurfaceSupport::Initialize()); | |
228 #endif | |
229 | |
230 content::DOMMessageQueue message_queue; | 222 content::DOMMessageQueue message_queue; |
231 NavigateToURL(shell(), TestUrl()); | 223 NavigateToURL(shell(), TestUrl()); |
232 if (wait_message != NULL) { | 224 if (wait_message != NULL) { |
233 std::string result(wait_message); | 225 std::string result(wait_message); |
234 if (!message_queue.WaitForMessage(&result)) { | 226 if (!message_queue.WaitForMessage(&result)) { |
235 EXPECT_TRUE(false) << "WaitForMessage " << result << " failed."; | 227 EXPECT_TRUE(false) << "WaitForMessage " << result << " failed."; |
236 return false; | 228 return false; |
237 } | 229 } |
238 } | 230 } |
239 | 231 |
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 CompositingRenderWidgetHostViewBrowserTestTabCapture, | 857 CompositingRenderWidgetHostViewBrowserTestTabCapture, |
866 testing::ValuesIn(kAllCompositingModes)); | 858 testing::ValuesIn(kAllCompositingModes)); |
867 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, | 859 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, |
868 CompositingRenderWidgetHostViewTabCaptureHighDPI, | 860 CompositingRenderWidgetHostViewTabCaptureHighDPI, |
869 testing::ValuesIn(kAllCompositingModes)); | 861 testing::ValuesIn(kAllCompositingModes)); |
870 | 862 |
871 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 863 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
872 | 864 |
873 } // namespace | 865 } // namespace |
874 } // namespace content | 866 } // namespace content |
OLD | NEW |