Remove gpu side LatencyInfo merging

content/browser/renderer_host/render_widget_host_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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 77 matching lines @@
 namespace {
 
 bool g_check_for_pending_resize_ack = true;
 
 // How long to (synchronously) wait for the renderer to respond with a
 // PaintRect message, when our backing-store is invalid, before giving up and
 // returning a null or incorrectly sized backing-store from GetBackingStore.
 // This timeout impacts the "choppiness" of our window resize perf.
 const int kPaintMsgTimeoutMS = 50;
 
+// Maximal number of LatencyInfo that can be contained in
+// ViewHostMsg_CompositorSurfaceBuffersSwapped_Params.
+const unsigned int kMaxLatencyInfoNumber = 100;
+
 typedef std::pair<int32, int32> RenderWidgetHostID;
 typedef base::hash_map<RenderWidgetHostID, RenderWidgetHostImpl*>
     RoutingIDWidgetMap;
 base::LazyInstance<RoutingIDWidgetMap> g_routing_id_widget_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // Implements the RenderWidgetHostIterator interface. It keeps a list of
 // RenderWidgetHosts, and makes sure it returns a live RenderWidgetHost at each
 // iteration (or NULL if there isn't any left).
 class RenderWidgetHostIteratorImpl : public RenderWidgetHostIterator {
@@ skipping 1354 matching lines @@
       NOTIFICATION_RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK,
       Source<RenderWidgetHost>(this),
       Details<std::pair<int, gfx::Size> >(&details));
 }
 
 #if defined(OS_MACOSX)
 void RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped(
       const ViewHostMsg_CompositorSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer_host",
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped");
+  if (params.latency_info.size() > kMaxLatencyInfoNumber) {
+    LOG(ERROR) << "ViewHostMsg_CompositorSurfaceBuffersSwapped LatencyInfo"
+               << " size " << params.latency_info.size() << " is too big.";
+    return;
+  }
   if (!view_) {
     AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
     ack_params.sync_point = 0;
     RenderWidgetHostImpl::AcknowledgeBufferPresent(params.route_id,
                                                    params.gpu_process_host_id,
                                                    ack_params);
     return;
   }
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params gpu_params;
   gpu_params.surface_id = params.surface_id;
@@ skipping 961 matching lines @@
       return;
     }
   }
 
   Send(new ViewMsg_WindowSnapshotCompleted(
       GetRoutingID(), snapshot_id, gfx::Size(), png));
 }
 
 // static
 void RenderWidgetHostImpl::CompositorFrameDrawn(
-    const ui::LatencyInfo& latency_info) {
-  std::set<RenderWidgetHostImpl*> rwhi_set;
-
-  for (ui::LatencyInfo::LatencyMap::const_iterator b =
-           latency_info.latency_components.begin();
-       b != latency_info.latency_components.end();
-       ++b) {
-    if (b->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT ||
-        b->first.first == ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT) {
-      // Matches with GetLatencyComponentId
-      int routing_id = b->first.second & 0xffffffff;
-      int process_id = (b->first.second >> 32) & 0xffffffff;
-      RenderWidgetHost* rwh =
-          RenderWidgetHost::FromID(process_id, routing_id);
-      if (!rwh) {
-        continue;
+    const std::vector<ui::LatencyInfo>& latency_info) {
+  for (size_t i = 0; i < latency_info.size(); i++) {
+    std::set<RenderWidgetHostImpl*> rwhi_set;
+    for (ui::LatencyInfo::LatencyMap::const_iterator b =
+             latency_info[i].latency_components.begin();
+         b != latency_info[i].latency_components.end();
+         ++b) {
+      if (b->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT ||
+          b->first.first == ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT) {
+        // Matches with GetLatencyComponentId
+        int routing_id = b->first.second & 0xffffffff;
+        int process_id = (b->first.second >> 32) & 0xffffffff;
+        RenderWidgetHost* rwh =
+            RenderWidgetHost::FromID(process_id, routing_id);
+        if (!rwh) {
+          continue;
+        }
+        RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
+        if (rwhi_set.insert(rwhi).second)
+          rwhi->FrameSwapped(latency_info[i]);
       }
-      RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
-      if (rwhi_set.insert(rwhi).second)
-        rwhi->FrameSwapped(latency_info);
     }
   }
 }
 
 }  // namespace content