Remove gpu side LatencyInfo merging

content/common/gpu/client/command_buffer_proxy_impl.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/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 197 matching lines @@
 
   Send(new GpuCommandBufferMsg_AsyncFlush(route_id_,
                                           put_offset,
                                           ++flush_count_));
 }
 
 void CommandBufferProxyImpl::SetLatencyInfo(
     const std::vector<ui::LatencyInfo>& latency_info) {
   if (last_state_.error != gpu::error::kNoError)
     return;
-  // TODO(miletus) : Pass the std::vector<ui::LatencyInfo> latency_info
-  // directly without merging once GpuCommandBufferMsg_SetLatencyInfo
-  // is converted to contain std::vector<ui::LatencyInfo>.
-  ui::LatencyInfo merged_latency;
-  for (size_t i = 0; i < latency_info.size(); i++)
-    merged_latency.MergeWith(latency_info[i]);
-  Send(new GpuCommandBufferMsg_SetLatencyInfo(route_id_, merged_latency));
+  Send(new GpuCommandBufferMsg_SetLatencyInfo(route_id_, latency_info));
 }
 
 gpu::CommandBuffer::State CommandBufferProxyImpl::FlushSync(
     int32 put_offset,
     int32 last_known_get) {
   TRACE_EVENT1("gpu", "CommandBufferProxyImpl::FlushSync", "put_offset",
                put_offset);
   Flush(put_offset);
   TryUpdateState();
   if (last_known_get == last_state_.get_offset) {
@@ skipping 360 matching lines @@
     const GpuConsoleMessageCallback& callback) {
   console_message_callback_ = callback;
 }
 
 void CommandBufferProxyImpl::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);
 }
 
 }  // namespace content