Remove gpu side LatencyInfo merging

content/common/gpu/image_transport_surface_win.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/common/gpu/image_transport_surface.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 30 matching lines @@
   virtual std::string GetExtensions() OVERRIDE;
   virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE;
   virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params) OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size, float scale_factor) OVERRIDE;
-  virtual void SetLatencyInfo(const ui::LatencyInfo&) OVERRIDE;
+  virtual void SetLatencyInfo(const std::vector<ui::LatencyInfo>&) OVERRIDE;
   virtual void WakeUpGpu() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
 
  private:
   virtual ~PbufferImageTransportSurface();
   void SendBuffersSwapped();
   void DestroySurface();
 
   // Tracks the current buffer allocation state.
   bool backbuffer_suggested_allocation_;
   bool frontbuffer_suggested_allocation_;
 
   // Whether a SwapBuffers is pending.
   bool is_swap_buffers_pending_;
 
   // Whether we unscheduled command buffer because of pending SwapBuffers.
   bool did_unschedule_;
 
   // Size to resize to when the surface becomes visible.
   gfx::Size visible_size_;
 
-  ui::LatencyInfo latency_info_;
+  std::vector<ui::LatencyInfo> latency_info_;
 
   scoped_ptr<ImageTransportHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(PbufferImageTransportSurface);
 };
 
 PbufferImageTransportSurface::PbufferImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : GLSurfaceAdapter(new gfx::PbufferGLSurfaceEGL(gfx::Size(1, 1))),
@@ skipping 107 matching lines @@
   extensions += extensions.empty() ? "" : " ";
   extensions += "GL_CHROMIUM_front_buffer_cached";
   return extensions;
 }
 
 void PbufferImageTransportSurface::SendBuffersSwapped() {
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_handle = reinterpret_cast<int64>(GetShareHandle());
   CHECK(params.surface_handle);
   params.size = GetSize();
-  params.latency_info = latency_info_;
+  params.latency_info.swap(latency_info_);
 
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   DCHECK(!is_swap_buffers_pending_);
   is_swap_buffers_pending_ = true;
 }
 
 void PbufferImageTransportSurface::OnBufferPresented(
     const AcceleratedSurfaceMsg_BufferPresented_Params& params) {
   if (!params.vsync_timebase.is_null() &&
@@ skipping 17 matching lines @@
   DCHECK(backbuffer_suggested_allocation_);
   DCHECK(frontbuffer_suggested_allocation_);
   Resize(size);
 
   DestroySurface();
 
   visible_size_ = size;
 }
 
 void PbufferImageTransportSurface::SetLatencyInfo(
-    const ui::LatencyInfo& latency_info) {
-  latency_info_ = latency_info;
+    const std::vector<ui::LatencyInfo>& latency_info) {
+  for (size_t i = 0; i < latency_info.size(); i++)
+    latency_info_.push_back(latency_info[i]);
 }
 
 void PbufferImageTransportSurface::WakeUpGpu() {
   NOTIMPLEMENTED();
 }
 
 gfx::Size PbufferImageTransportSurface::GetSize() {
   return GLSurfaceAdapter::GetSize();
 }
 
@@ skipping 30 matching lines @@
 
   scoped_refptr<gfx::GLSurface> surface =
       gfx::GLSurface::CreateViewGLSurface(handle.handle);
   if (!surface)
     return surface;
   return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface(
       manager, stub, surface.get(), handle.is_transport()));
 }
 
 }  // namespace content