Remove gpu side LatencyInfo merging

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index fd3a7f22fe71ae0b451b6bf898700cf56445627f..163a8bac4ce805f25d2929a00b6b8c38bc7f3f3b 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -162,6 +162,10 @@ static const char* kSiteProcessMapKeyName = "content_site_process_map";
 namespace content {
 namespace {
 
+// Maximal number of LatencyInfo that can be contained in
+// ViewHostMsg_CompositorSurfaceBuffersSwapped_Params.
+const unsigned int kMaxLatencyInfoNumber = 100;
+
 void CacheShaderInfo(int32 id, base::FilePath path) {
   ShaderCacheFactory::GetInstance()->SetCacheInfo(id, path);
 }
@@ -1987,6 +1991,11 @@ void RenderProcessHostImpl::OnCompositorSurfaceBuffersSwappedNoHost(
       const ViewHostMsg_CompositorSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer_host",
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
+  if (params.latency_info.size() > kMaxLatencyInfoNumber) {
+    LOG(ERROR) << "ViewHostMsg_CompositorSurfaceBuffersSwapped LatencyInfo"
+               << " size " << params.latency_info.size() << " is too big.";
+    return;
+  }
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.sync_point = 0;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(params.route_id,