Revert of Overlays: Remove special casing of primary overlay plane

content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc

Index: content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
index 0ce27732e497d59ed8fe709b11657bcfe4ec98d5..b70436b17c7c007b3c5151a2d68ebc43e0c24eae 100644
--- a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
@@ -57,11 +57,6 @@
     ~GpuSurfacelessBrowserCompositorOutputSurface() {
 }
 
-bool GpuSurfacelessBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
-    const {
-  return true;
-}
-
 unsigned GpuSurfacelessBrowserCompositorOutputSurface::GetOverlayTextureId()
     const {
   return output_surface_->current_texture_id();
@@ -70,7 +65,22 @@
 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers(
     cc::CompositorFrame* frame) {
   DCHECK(output_surface_);
+
+  GLuint texture = output_surface_->current_texture_id();
   output_surface_->SwapBuffers(frame->gl_frame_data->sub_buffer_rect);
+  const gfx::Size& size = frame->gl_frame_data->size;
+  context_provider_->ContextGL()->ScheduleOverlayPlaneCHROMIUM(
+      0,
+      GL_OVERLAY_TRANSFORM_NONE_CHROMIUM,
+      texture,
+      0,
+      0,
+      size.width(),
+      size.height(),
+      0,
+      0,
+      1.0f,
+      1.0f);
   GpuBrowserCompositorOutputSurface::SwapBuffers(frame);
 }