Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_browsertest.cc

Issue 943763004: cc: Remove the unused compositor thread variable and interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: compositorthread: . Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/barrier_closure.h" 5 #include "base/barrier_closure.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/message_loop/message_loop_proxy.h" 7 #include "base/message_loop/message_loop_proxy.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "content/browser/gpu/compositor_util.h" 10 #include "content/browser/gpu/compositor_util.h"
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 gfx::Rect copy_rect(200, 100); 935 gfx::Rect copy_rect(200, 100);
936 // Output is being down-scaled since output_size is in phyiscal pixels. 936 // Output is being down-scaled since output_size is in phyiscal pixels.
937 gfx::Size output_size(200, 100); 937 gfx::Size output_size(200, 100);
938 bool video_frame = true; 938 bool video_frame = true;
939 PerformTestWithLeftRightRects(html_rect_size, 939 PerformTestWithLeftRightRects(html_rect_size,
940 copy_rect, 940 copy_rect,
941 output_size, 941 output_size,
942 video_frame); 942 video_frame);
943 } 943 }
944 944
945 #if defined(OS_CHROMEOS)
946 // On ChromeOS there is no software compositing.
947 static const auto kTestCompositingModes = testing::Values(GL_COMPOSITING);
948 #else
949 static const auto kTestCompositingModes =
950 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING);
951 #endif
952
945 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, 953 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing,
946 CompositingRenderWidgetHostViewBrowserTest, 954 CompositingRenderWidgetHostViewBrowserTest,
947 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); 955 kTestCompositingModes);
948 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing, 956 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing,
949 CompositingRenderWidgetHostViewBrowserTestTabCapture, 957 CompositingRenderWidgetHostViewBrowserTestTabCapture,
950 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); 958 kTestCompositingModes);
951 INSTANTIATE_TEST_CASE_P( 959 INSTANTIATE_TEST_CASE_P(
952 GLAndSoftwareCompositing, 960 GLAndSoftwareCompositing,
953 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI, 961 CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
954 testing::Values(GL_COMPOSITING, SOFTWARE_COMPOSITING)); 962 kTestCompositingModes);
955 963
956 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 964 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
957 965
958 } // namespace 966 } // namespace
959 } // namespace content 967 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698