Remove gpu side LatencyInfo merging

content/browser/renderer_host/render_widget_host_view_mac.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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <list>
 #include <map>
@@ skipping 326 matching lines @@
   // Sends completed plugin IME notification and text back to the renderer.
   void PluginImeCompositionCompleted(const base::string16& text, int plugin_id);
 
   const std::string& selected_text() const { return selected_text_; }
 
   // Update the IOSurface to be drawn and call setNeedsDisplay on
   // |cocoa_view_|.
   void CompositorSwapBuffers(uint64 surface_handle,
                              const gfx::Size& size,
                              float scale_factor,
-                             const ui::LatencyInfo& latency_info);
+                             const std::vector<ui::LatencyInfo>& latency_info);
 
   // Draw the IOSurface by making its context current to this view.
   bool DrawIOSurfaceWithoutCoreAnimation();
 
   // Called when a GPU error is detected. Deletes all compositing state.
   void GotAcceleratedCompositingError();
 
   // Sets the overlay view, which should be drawn in the same IOSurface
   // atop of this view, if both views are drawing accelerated content.
   // Overlay is stored as a weak ptr.
@@ skipping 201 matching lines @@
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       software_frame_weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_