Add a completion callback to gpuBenchmarking.beginSmoothScroll

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 <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1550 matching lines @@
   // (OnMsgInputEventAck) method, but not on other platforms; using
   // 'void' instead is just as safe (since NotificationSource
   // is not actually typesafe) and avoids this error.
   NotificationService::current()->Notify(
       NOTIFICATION_RENDER_WIDGET_HOST_DID_RECEIVE_INPUT_EVENT_ACK,
       Source<void>(this),
       Details<int>(&type));
 }
 
 void RenderWidgetHostImpl::OnMsgBeginSmoothScroll(
-    bool scroll_down, bool scroll_far) {
+    int gesture_id, bool scroll_down, bool scroll_far) {
   if (!view_)
     return;
-  active_smooth_scroll_gesture_.reset(
-      view_->CreateSmoothScrollGesture(scroll_down, scroll_far));
+  active_smooth_scroll_gestures_.insert(
+      std::make_pair(gesture_id,
+                     view_->CreateSmoothScrollGesture(
+                         scroll_down, scroll_far)));
   TickActiveSmoothScrollGesture();
 }
 
 void RenderWidgetHostImpl::TickActiveSmoothScrollGesture() {
-  if (!active_smooth_scroll_gesture_.get())
+  if (active_smooth_scroll_gestures_.size() == 0)
     return;
 
   TimeTicks now = TimeTicks::HighResNow();
 
   // Post the next tick right away so it is regular.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&RenderWidgetHostImpl::TickActiveSmoothScrollGesture,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kSyntheticScrollMessageIntervalMs));
 
+  // Separate ticking of gestures from sending their completion messages.
+  std::vector<int> ids_that_are_done;
+  for (SmoothScrollGestureMap::iterator it =
+           active_smooth_scroll_gestures_.begin();
+       it != active_smooth_scroll_gestures_.end();
+       ++it) {
 
-  bool active = active_smooth_scroll_gesture_->ForwardInputEvents(now, this);
-  if (!active) {
-    active_smooth_scroll_gesture_.reset();
-    // TODO(nduca): send "smooth scroll done" event to RenderWidget.
+    bool active = it->second->ForwardInputEvents(now, this);
+    if (!active)
+      ids_that_are_done.push_back(it->first);
+  }
+
+  // Delete completed gestures and send their completion event.
+  for(size_t i = 0; i < ids_that_are_done.size(); i++) {
+    int id = ids_that_are_done[i];
+    SmoothScrollGestureMap::iterator it =
+        active_smooth_scroll_gestures_.find(id);
+    DCHECK(it != active_smooth_scroll_gestures_.end());
+    active_smooth_scroll_gestures_.erase(it);
+
+    Send(new ViewMsg_SmoothScrollCompleted(routing_id_, id));
   }
 }
 
 void RenderWidgetHostImpl::OnMsgSelectRangeAck() {
   select_range_pending_ = false;
   if (next_selection_range_.get()) {
     scoped_ptr<SelectionRange> next(next_selection_range_.Pass());
     SelectRange(next->start, next->end);
   }
 }
@@ skipping 407 matching lines @@
   // indicate that no callback is in progress (i.e. without this line
   // DelayedAutoResized will not get called again).
   new_auto_size_.SetSize(0, 0);
   if (!should_auto_resize_)
     return;
 
   OnRenderAutoResized(new_size);
 }
 
 }  // namespace content