Revert of Overlays: Remove special casing of primary overlay plane

content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc

 // Copyright 2014 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 "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/buffer_queue.h"
@@ skipping 39 matching lines @@
   output_surface_.reset(new BufferQueue(
       context_provider_, target, internalformat_, gl_helper_.get(),
       gpu_memory_buffer_manager_, surface_id));
   output_surface_->Initialize();
 }
 
 GpuSurfacelessBrowserCompositorOutputSurface::
     ~GpuSurfacelessBrowserCompositorOutputSurface() {
 }
 
-bool GpuSurfacelessBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
-    const {
-  return true;
-}
-
 unsigned GpuSurfacelessBrowserCompositorOutputSurface::GetOverlayTextureId()
     const {
   return output_surface_->current_texture_id();
 }
 
 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);
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersComplete() {
   DCHECK(output_surface_);
   output_surface_->PageFlipComplete();
   GpuBrowserCompositorOutputSurface::OnSwapBuffersComplete();
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::BindFramebuffer() {
@@ skipping 30 matching lines @@
 #endif
 }
 
 #if defined(OS_MACOSX)
 void GpuSurfacelessBrowserCompositorOutputSurface::OnSurfaceDisplayed() {
   OnSwapBuffersComplete();
 }
 #endif
 
 }  // namespace content