Always use DirectCompositionSurfaceWin when using DirectComposition

gpu/ipc/service/direct_composition_surface_win.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/service/direct_composition_surface_win.h"
 
 #include <d3d11_1.h>
 #include <dcomptypes.h>
 
 #include <deque>
@@ skipping 973 matching lines @@
       child_window_(delegate, parent_window),
       workarounds_(delegate->GetFeatureInfo()->workarounds()),
       vsync_provider_(std::move(vsync_provider)) {}
 
 DirectCompositionSurfaceWin::~DirectCompositionSurfaceWin() {
   Destroy();
 }
 
 // static
 bool DirectCompositionSurfaceWin::AreOverlaysSupported() {
-  if (!HardwareSupportsOverlays())
-    return false;
+  static bool initialized;
+  static bool overlays_supported;
+  if (initialized)
+    return overlays_supported;
 
-  return base::FeatureList::IsEnabled(switches::kDirectCompositionOverlays);
+  initialized = true;
+
+  if (HardwareSupportsOverlays()) {
+    overlays_supported =

[sunnyps, 2017/07/24 22:03:47]

nit: overlays_supported = base::FeatureList::IsEnabled(...) &&
HardwareSupportsOverlays()

+        base::FeatureList::IsEnabled(switches::kDirectCompositionOverlays);
+  } else {
+    overlays_supported = false;
+  }
+
+  UMA_HISTOGRAM_BOOLEAN("GPU.DirectComposition.OverlaysSupported",
+                        overlays_supported);
+  return overlays_supported;
 }
 
 // static
 bool DirectCompositionSurfaceWin::IsHDRSupported() {
   bool hdr_monitor_found = false;
 #if defined(ENABLE_HDR_DETECTION)
   base::win::ScopedComPtr<ID3D11Device> d3d11_device =
       gl::QueryD3D11DeviceObjectFromANGLE();
   if (!d3d11_device) {
     DLOG(ERROR) << "Failing to detect HDR, couldn't retrieve D3D11 "
@@ skipping 163 matching lines @@
 bool DirectCompositionSurfaceWin::OnMakeCurrent(gl::GLContext* context) {
   if (root_surface_)
     return root_surface_->OnMakeCurrent(context);
   return true;
 }
 
 bool DirectCompositionSurfaceWin::SupportsDCLayers() const {
   return true;
 }
 
+bool DirectCompositionSurfaceWin::UseOverlaysForVideo() const {
+  return AreOverlaysSupported();
+}
+
 bool DirectCompositionSurfaceWin::SetDrawRectangle(const gfx::Rect& rectangle) {
   if (root_surface_)
     return root_surface_->SetDrawRectangle(rectangle);
   return false;
 }
 
 gfx::Vector2d DirectCompositionSurfaceWin::GetDrawOffset() const {
   if (root_surface_)
     return root_surface_->GetDrawOffset();
   return gfx::Vector2d();
@@ skipping 24 matching lines @@
 DirectCompositionSurfaceWin::GetWindowTaskRunnerForTesting() {
   return child_window_.GetTaskRunnerForTesting();
 }
 
 base::win::ScopedComPtr<IDXGISwapChain1>
 DirectCompositionSurfaceWin::GetLayerSwapChainForTesting(size_t index) const {
   return layer_tree_->GetLayerSwapChainForTesting(index);
 }
 
 }  // namespace gpu