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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2122303003: Remove kOzoneTestSingleOverlaySupport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation. Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | ui/ozone/platform/drm/host/drm_overlay_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 841fea0e2f64be6d92b08702cd7ae212a0e29dbd..c6e4a9078b38da5d5a54c2b47496db06689aaaa3 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -218,14 +218,12 @@ CreateOverlayCandidateValidator(gfx::AcceleratedWidget widget) {
std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
validator;
#if defined(USE_OZONE)
- std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates =
- ui::OzonePlatform::GetInstance()
- ->GetOverlayManager()
- ->CreateOverlayCandidates(widget);
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- if (overlay_candidates &&
- (command_line->HasSwitch(switches::kEnableHardwareOverlays) ||
- command_line->HasSwitch(switches::kOzoneTestSingleOverlaySupport))) {
+ if (command_line->HasSwitch(switches::kEnableHardwareOverlays)) {
+ std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates =
+ ui::OzonePlatform::GetInstance()
+ ->GetOverlayManager()
+ ->CreateOverlayCandidates(widget);
validator.reset(
new display_compositor::CompositorOverlayCandidateValidatorOzone(
std::move(overlay_candidates)));
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | ui/ozone/platform/drm/host/drm_overlay_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698