Plumb cc::LatencyInfo through command buffer and output surface

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/Source/Platform/chromium/public/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;
-using WebKit::WebGraphicsContext3D;
 
 namespace content {
 
 MailboxOutputSurface::MailboxOutputSurface(
     int32 routing_id,
-    WebGraphicsContext3D* context3D,
+    WebGraphicsContext3DCommandBufferImpl* context3D,
     cc::SoftwareOutputDevice* software_device)
     : CompositorOutputSurface(routing_id, context3D, software_device),
       fbo_(0),
       is_backbuffer_discarded_(false) {
   pending_textures_.push_back(TransferableFrame());
 }
 
 MailboxOutputSurface::~MailboxOutputSurface() {
   DiscardBackbuffer();
   while (!pending_textures_.empty()) {
@@ skipping 144 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() {
+void MailboxOutputSurface::SwapBuffers(const cc::LatencyInfo&) {
 }
 
-void MailboxOutputSurface::PostSubBuffer(gfx::Rect rect) {
+void MailboxOutputSurface::PostSubBuffer(gfx::Rect rect,
+                                         const cc::LatencyInfo&) {
   NOTIMPLEMENTED()
       << "Partial swap not supported with composite-to-mailbox yet.";
 
   // The browser only copies damage correctly for two buffers in use.
   DCHECK(GetNumAcksPending() < 3);
 }
 
 void MailboxOutputSurface::ConsumeTexture(const TransferableFrame& frame) {
   DCHECK(!frame.mailbox.IsZero());
   if (frame.sync_point)
     context3d_->waitSyncPoint(frame.sync_point);
 
   context3d_->bindTexture(GL_TEXTURE_2D, frame.texture_id);
   context3d_->consumeTextureCHROMIUM(GL_TEXTURE_2D, frame.mailbox.name);
 }
 
 size_t MailboxOutputSurface::GetNumAcksPending() {
   DCHECK(pending_textures_.size());
   return pending_textures_.size() - 1;
 }
 
 }  // namespace content