Remove gpu side LatencyInfo merging

content/common/gpu/image_transport_surface.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 45 matching lines @@
 
 class ImageTransportSurface {
  public:
   ImageTransportSurface();
 
   virtual void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params) = 0;
   virtual void OnResizeViewACK() = 0;
   virtual void OnResize(gfx::Size size, float scale_factor) = 0;
   virtual void SetLatencyInfo(
-      const ui::LatencyInfo& latency_info) = 0;
+      const std::vector<ui::LatencyInfo>& latency_info) = 0;
   virtual void WakeUpGpu() = 0;
 
   // Creates a surface with the given attributes.
   static scoped_refptr<gfx::GLSurface> CreateSurface(
       GpuChannelManager* manager,
       GpuCommandBufferStub* stub,
       const gfx::GLSurfaceHandle& handle);
 
 #if defined(OS_MACOSX)
   CONTENT_EXPORT static void SetAllowOSMesaForTesting(bool allow);
@@ skipping 41 matching lines @@
   // like size and surface id. The helper fills in the rest.
   void SendAcceleratedSurfaceBuffersSwapped(
       GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params);
   void SendAcceleratedSurfacePostSubBuffer(
       GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params);
   void SendAcceleratedSurfaceRelease();
   void SendResizeView(const gfx::Size& size);
   void SendUpdateVSyncParameters(
       base::TimeTicks timebase, base::TimeDelta interval);
 
-  void SendLatencyInfo(const ui::LatencyInfo& latency_info);
+  void SendLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
 
   // Whether or not we should execute more commands.
   void SetScheduled(bool is_scheduled);
 
   void DeferToFence(base::Closure task);
 
   void SetPreemptByFlag(
       scoped_refptr<gpu::PreemptionFlag> preemption_flag);
 
   // Make the surface's context current.
@@ skipping 13 matching lines @@
 
   // IPC::Message handlers.
   void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params);
   void OnResizeViewACK();
   void OnWakeUpGpu();
 
   // Backbuffer resize callback.
   void Resize(gfx::Size size, float scale_factor);
 
-  void SetLatencyInfo(const ui::LatencyInfo& latency_info);
+  void SetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
 
   // Weak pointers that point to objects that outlive this helper.
   ImageTransportSurface* surface_;
   GpuChannelManager* manager_;
 
   base::WeakPtr<GpuCommandBufferStub> stub_;
   int32 route_id_;
   gfx::PluginWindowHandle handle_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageTransportHelper);
@@ skipping 18 matching lines @@
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
 
   // 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 gfx::Size GetSize() OVERRIDE;
   virtual void SetLatencyInfo(
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const std::vector<ui::LatencyInfo>& latency_info) OVERRIDE;
   virtual void WakeUpGpu() OVERRIDE;
 
  protected:
   virtual ~PassThroughImageTransportSurface();
 
   // If updated vsync parameters can be determined, send this information to
   // the browser.
   virtual void SendVSyncUpdateIfAvailable();
 
   ImageTransportHelper* GetHelper() { return helper_.get(); }
 
  private:
   scoped_ptr<ImageTransportHelper> helper_;
   gfx::Size new_size_;
   bool transport_;
   bool did_set_swap_interval_;
   bool did_unschedule_;
   bool is_swap_buffers_pending_;
-  ui::LatencyInfo latency_info_;
+  std::vector<ui::LatencyInfo> latency_info_;
 
   DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_