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

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

Issue 1376883004: Overlays: Remove special casing of primary overlay plane (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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 | « content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b70436b17c7c007b3c5151a2d68ebc43e0c24eae..0ce27732e497d59ed8fe709b11657bcfe4ec98d5 100644
--- a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
@@ -57,6 +57,11 @@ GpuSurfacelessBrowserCompositorOutputSurface::
~GpuSurfacelessBrowserCompositorOutputSurface() {
}
+bool GpuSurfacelessBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
+ const {
+ return true;
+}
+
unsigned GpuSurfacelessBrowserCompositorOutputSurface::GetOverlayTextureId()
const {
return output_surface_->current_texture_id();
@@ -65,22 +70,7 @@ unsigned GpuSurfacelessBrowserCompositorOutputSurface::GetOverlayTextureId()
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);
}
« no previous file with comments | « content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698