Remove gpu side LatencyInfo merging

content/browser/gpu/gpu_process_host_ui_shim.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/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 
 namespace content {
 
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
+const unsigned int kMaxLatencyInfoNumber = 100;
+
 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id =
     LAZY_INSTANCE_INITIALIZER;
 
 void SendOnIOThreadTask(int host_id, IPC::Message* msg) {
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->Send(msg);
   else
     delete msg;
 }
@@ skipping 228 matching lines @@
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
   if (!view)
     return;
   view->AcceleratedSurfaceInitialized(host_id_, route_id);
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
+  if (params.latency_info.size() > kMaxLatencyInfoNumber) {
+    LOG(ERROR) << "GpuHostMsg_AcceleratedSurfaceBuffersSwapped LatencyInfo"
+               << " size " << params.latency_info.size() << " is too big.";
+    return;
+  }
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox_name = params.mailbox_name;
   ack_params.sync_point = 0;
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
                                                 ack_params));
 
   if (!params.mailbox_name.empty() &&
       params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
     return;
 
   RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
 
   delayed_send.Cancel();
 
   static const base::TimeDelta swap_delay = GetSwapDelay();
   if (swap_delay.ToInternalValue())
     base::PlatformThread::Sleep(swap_delay);
 
   // View must send ACK message after next composite.
   view->AcceleratedSurfaceBuffersSwapped(params, host_id_);
   view->DidReceiveRendererFrame();
 }
 
-void GpuProcessHostUIShim::OnFrameDrawn(const ui::LatencyInfo& latency_info) {
+void GpuProcessHostUIShim::OnFrameDrawn(
+    const std::vector<ui::LatencyInfo>& latency_info) {
+  if (latency_info.size() > kMaxLatencyInfoNumber) {
+    LOG(ERROR) << "GpuProcessHostUIShim::OnFrameDrawn LatencyInfo"
+               << " size " << latency_info.size() << " is too big.";
+    return;
+  }
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer");
-
+  if (params.latency_info.size() > kMaxLatencyInfoNumber) {
+    LOG(ERROR) << "GpuHostMsg_AcceleratedSurfacePostSubBuffer LatencyInfo"
+               << " size " << params.latency_info.size() << " is too big.";
+    return;
+  }
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox_name = params.mailbox_name;
   ack_params.sync_point = 0;
    ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
                                                 ack_params));
 
   if (!params.mailbox_name.empty() &&
       params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
@@ skipping 32 matching lines @@
   view->AcceleratedSurfaceRelease();
 }
 
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
     const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(
       video_memory_usage_stats);
 }
 
 }  // namespace content