Remove gpu side LatencyInfo merging

content/common/gpu/texture_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_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 35 matching lines @@
   virtual void* GetDisplay() OVERRIDE;
   virtual void* GetConfig() 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& latency_info) OVERRIDE;
+      const std::vector<ui::LatencyInfo>& latency_info) OVERRIDE;
   virtual void WakeUpGpu() OVERRIDE;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
   virtual void OnWillDestroyStub() OVERRIDE;
 
  private:
 
   gfx::Size backbuffer_size() const {
     DCHECK(backbuffer_.get());
     GLsizei width = 0;
@@ skipping 42 matching lines @@
 
   // Whether a SwapBuffers is pending.
   bool is_swap_buffers_pending_;
 
   // Whether we unscheduled command buffer because of pending SwapBuffers.
   bool did_unschedule_;
 
   // Holds a reference to the mailbox manager for cleanup.
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
 
-  ui::LatencyInfo latency_info_;
+  std::vector<ui::LatencyInfo> latency_info_;
   DISALLOW_COPY_AND_ASSIGN(TextureImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_