Unified OutputSurface::SwapBuffers.

content/renderer/gpu/mailbox_output_surface.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 "content/renderer/gpu/mailbox_output_surface.h"
 
 #include "base/logging.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/gl_frame_data.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using cc::CompositorFrame;
 using cc::GLFrameData;
 using gpu::Mailbox;
 
 namespace content {
 
 MailboxOutputSurface::MailboxOutputSurface(
     int32 routing_id,
     WebGraphicsContext3DCommandBufferImpl* context3D,
     cc::SoftwareOutputDevice* software_device)
-    : CompositorOutputSurface(routing_id, context3D, software_device),
+    : CompositorOutputSurface(routing_id, context3D, software_device, true),
       fbo_(0),
       is_backbuffer_discarded_(false) {
   pending_textures_.push_back(TransferableFrame());
   capabilities_.max_frames_pending = 1;
 }
 
 MailboxOutputSurface::~MailboxOutputSurface() {
   DiscardBackbuffer();
   while (!pending_textures_.empty()) {
     if (pending_textures_.front().texture_id)
@@ skipping 80 matching lines @@
   DCHECK(current_backing_.texture_id);
 
   if (!fbo_)
     fbo_ = context3d_->createFramebuffer();
   context3d_->bindFramebuffer(GL_FRAMEBUFFER, fbo_);
   context3d_->framebufferTexture2D(
       GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
       current_backing_.texture_id, 0);
 }
 
-void MailboxOutputSurface::SendFrameToParentCompositor(
-    cc::CompositorFrame* frame) {
-  frame->gl_frame_data.reset(new GLFrameData());
-
-  DCHECK(!surface_size_.IsEmpty());
-  DCHECK(surface_size_ == current_backing_.size);
-  DCHECK(!current_backing_.mailbox.IsZero());
-
-  frame->gl_frame_data->mailbox = current_backing_.mailbox;
-  frame->gl_frame_data->size = current_backing_.size;
-  context3d_->flush();
-  frame->gl_frame_data->sync_point = context3d_->insertSyncPoint();
-  CompositorOutputSurface::SendFrameToParentCompositor(frame);
-
-  pending_textures_.push_back(current_backing_);
-  current_backing_ = TransferableFrame();
-}
-
 void MailboxOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) {
   if (!ack.gl_frame_data->mailbox.IsZero()) {
     DCHECK(!ack.gl_frame_data->size.IsEmpty());
     // The browser could be returning the oldest or any other pending texture
     // if it decided to skip a frame.
     std::deque<TransferableFrame>::iterator it;
     for (it = pending_textures_.begin(); it != pending_textures_.end(); it++) {
       DCHECK(!it->mailbox.IsZero());
       if (!memcmp(it->mailbox.name,
                   ack.gl_frame_data->mailbox.name,
@@ skipping 18 matching lines @@
     // If it does not return a mailbox, it discarded the frontbuffer which is
     // the oldest texture we sent.
     uint32 texture_id = pending_textures_.front().texture_id;
     if (texture_id)
       context3d_->deleteTexture(texture_id);
     pending_textures_.pop_front();
   }
   CompositorOutputSurface::OnSwapAck(ack);
 }
 
-void MailboxOutputSurface::SwapBuffers(const ui::LatencyInfo&) {
-}
-
-void MailboxOutputSurface::PostSubBuffer(gfx::Rect rect,
-                                         const ui::LatencyInfo&) {
-  NOTIMPLEMENTED()
+void MailboxOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
+  DCHECK(frame->gl_frame_data);
+  DCHECK(frame->gl_frame_data->sub_buffer_rect.size() ==
+         frame->gl_frame_data->size)
       << "Partial swap not supported with composite-to-mailbox yet.";
 
-  // The browser only copies damage correctly for two buffers in use.
-  DCHECK(GetNumAcksPending() < 2);
+  DCHECK(!surface_size_.IsEmpty());
+  DCHECK(surface_size_ == current_backing_.size);
+  DCHECK(frame->gl_frame_data->size == current_backing_.size);
+  DCHECK(!current_backing_.mailbox.IsZero());
+
+  frame->gl_frame_data->mailbox = current_backing_.mailbox;
+  context3d_->flush();
+  frame->gl_frame_data->sync_point = context3d_->insertSyncPoint();
+  CompositorOutputSurface::SwapBuffers(frame);
+
+  pending_textures_.push_back(current_backing_);
+  current_backing_ = TransferableFrame();
 }
 
 size_t MailboxOutputSurface::GetNumAcksPending() {
   DCHECK(pending_textures_.size());
   return pending_textures_.size() - 1;
 }
 
 }  // namespace content