Always use DirectCompositionSurfaceWin when using DirectComposition

gpu/ipc/service/image_transport_surface_win.cc

 // Copyright (c) 2012 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/image_transport_surface.h"
 
 #include <memory>
 
-#include "base/metrics/histogram_macros.h"
 #include "base/win/windows_version.h"
-#include "gpu/ipc/service/child_window_surface_win.h"
 #include "gpu/ipc/service/direct_composition_surface_win.h"
 #include "gpu/ipc/service/gpu_vsync_provider_win.h"
 #include "gpu/ipc/service/pass_through_image_transport_surface.h"
 #include "gpu/ipc/service/switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
@@ skipping 23 matching lines @@
       kMultiWindowSwapIntervalDefault;
   if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2) {
     std::unique_ptr<gfx::VSyncProvider> vsync_provider;
 
     if (IsGpuVSyncSignalSupported())
       vsync_provider.reset(new GpuVSyncProviderWin(delegate, surface_handle));
     else
       vsync_provider.reset(new gl::VSyncProviderWin(surface_handle));
 
     if (gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
-      bool overlays_supported =
-          DirectCompositionSurfaceWin::AreOverlaysSupported();
-      UMA_HISTOGRAM_BOOLEAN("GPU.DirectComposition.OverlaysSupported",
-                            overlays_supported);
-      if (overlays_supported) {
-        scoped_refptr<DirectCompositionSurfaceWin> egl_surface =
-            make_scoped_refptr(new DirectCompositionSurfaceWin(
-                std::move(vsync_provider), delegate, surface_handle));
-        if (!egl_surface->Initialize())
-          return nullptr;
-        surface = egl_surface;
-      } else {
-        scoped_refptr<ChildWindowSurfaceWin> egl_surface =
-            make_scoped_refptr(new ChildWindowSurfaceWin(
-                std::move(vsync_provider), delegate, surface_handle));
-        if (!egl_surface->Initialize())
-          return nullptr;
-        surface = egl_surface;
-      }
+      scoped_refptr<DirectCompositionSurfaceWin> egl_surface =
+          make_scoped_refptr(new DirectCompositionSurfaceWin(
+              std::move(vsync_provider), delegate, surface_handle));
+      if (!egl_surface->Initialize())
+        return nullptr;
+      surface = egl_surface;
     } else {
       surface = gl::init::CreateNativeViewGLSurfaceEGL(
           surface_handle, std::move(vsync_provider));
       // This is unnecessary with DirectComposition because that doesn't block
       // swaps, but instead blocks the first draw into a surface during the next
       // frame.
       multi_window_swap_interval = kMultiWindowSwapIntervalForceZero;
       if (!surface)
         return nullptr;
     }
   } else {
     surface = gl::init::CreateViewGLSurface(surface_handle);
     if (!surface)
       return nullptr;
   }
 
   return scoped_refptr<gl::GLSurface>(new PassThroughImageTransportSurface(
       delegate, surface.get(), multi_window_swap_interval));
 }
 
 }  // namespace gpu