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 17 matching lines...) Expand all Loading... |
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/geometry/size_conversions.h" | 32 #include "ui/gfx/geometry/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_WIN) | 36 #if defined(OS_WIN) |
37 #include "base/win/windows_version.h" | 37 #include "base/win/windows_version.h" |
38 #include "ui/gfx/win/dpi.h" | |
39 #endif | 38 #endif |
40 | 39 |
41 namespace content { | 40 namespace content { |
42 namespace { | 41 namespace { |
43 | 42 |
44 // Convenience macro: Short-circuit a pass for the tests where platform support | 43 // Convenience macro: Short-circuit a pass for the tests where platform support |
45 // for forced-compositing mode (or disabled-compositing mode) is lacking. | 44 // for forced-compositing mode (or disabled-compositing mode) is lacking. |
46 #define SET_UP_SURFACE_OR_PASS_TEST(wait_message) \ | 45 #define SET_UP_SURFACE_OR_PASS_TEST(wait_message) \ |
47 if (!SetUpSourceSurface(wait_message)) { \ | 46 if (!SetUpSourceSurface(wait_message)) { \ |
48 LOG(WARNING) \ | 47 LOG(WARNING) \ |
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
908 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); | 907 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); |
909 INSTANTIATE_TEST_CASE_P( | 908 INSTANTIATE_TEST_CASE_P( |
910 GLAndSoftwareCompositing, | 909 GLAndSoftwareCompositing, |
911 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI, | 910 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI, |
912 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); | 911 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); |
913 | 912 |
914 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 913 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
915 | 914 |
916 } // namespace | 915 } // namespace |
917 } // namespace content | 916 } // namespace content |
OLD | NEW |