Remove gpu side LatencyInfo merging

content/browser/renderer_host/compositing_iosurface_mac.mm

 // 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/browser/renderer_host/compositing_iosurface_mac.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/OpenGL.h>
 
 #include "base/bind.h"
@@ skipping 314 matching lines @@
   DestroyAllCopyContextsWithinContext();
   UnrefIOSurfaceWithContextCurrent();
   CGLSetCurrentContext(0);
   offscreen_context_ = NULL;
 }
 
 bool CompositingIOSurfaceMac::SetIOSurface(
     uint64 io_surface_handle,
     const gfx::Size& size,
     float scale_factor,
-    const ui::LatencyInfo& latency_info) {
+    const std::vector<ui::LatencyInfo>& latency_info) {
   pixel_io_surface_size_ = size;
   scale_factor_ = scale_factor;
   dip_io_surface_size_ = gfx::ToFlooredSize(
       gfx::ScaleSize(pixel_io_surface_size_, 1.0 / scale_factor_));
 
   CGLError cgl_error = CGLSetCurrentContext(offscreen_context_->cgl_context());
   if (cgl_error != kCGLNoError) {
     LOG(ERROR) << "CGLSetCurrentContext error in SetIOSurface: " << cgl_error;
     return false;
   }
   bool result = MapIOSurfaceToTexture(io_surface_handle);
   CGLSetCurrentContext(0);
-  latency_info_.MergeWith(latency_info);
+  for (size_t i = 0; i < latency_info.size(); i++) {
+    latency_info_.push_back(latency_info[i]);
+  }
   return result;
 }
 
 int CompositingIOSurfaceMac::GetRendererID() {
   GLint current_renderer_id = -1;
   if (CGLGetParameter(offscreen_context_->cgl_context(),
                       kCGLCPCurrentRendererID,
                       &current_renderer_id) == kCGLNoError)
     return current_renderer_id & kCGLRendererIDMatchingMask;
   return -1;
@@ skipping 129 matching lines @@
     }
   }
 
   // Check if any of the drawing calls result in an error.
   GetAndSaveGLError();
   if (gl_error_ != GL_NO_ERROR) {
     LOG(ERROR) << "GL error in DrawIOSurface: " << gl_error_;
     result = false;
   }
 
-  latency_info_.AddLatencyNumber(
-      ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0);
+  for (size_t i = 0; i < latency_info_.size(); i++) {
+    latency_info_[i].AddLatencyNumber(
+          ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0);
+  }
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info_);
-  latency_info_.Clear();
+  latency_info_.clear();
 
   // Try to finish previous copy requests after flush to get better pipelining.
   CheckIfAllCopiesAreFinished(false);
 
   StartOrContinueDisplayLink();
 
   return result;
 }
 
 void CompositingIOSurfaceMac::CopyTo(
@@ skipping 527 matching lines @@
 }
 
 GLenum CompositingIOSurfaceMac::GetAndSaveGLError() {
   GLenum gl_error = glGetError();
   if (gl_error_ == GL_NO_ERROR)
     gl_error_ = gl_error;
   return gl_error;
 }
 
 }  // namespace content