Add a completion callback to gpuBenchmarking.beginSmoothScroll

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "content/common/content_export.h"
 #include "content/renderer/paint_aggregator.h"
@@ skipping 133 matching lines @@
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
   void CleanupWindowInPluginMoves(gfx::PluginWindowHandle window);
 
   // Fills in a WebRenderingStats struct containing information about
   // rendering, e.g. count of frames rendered, time spent painting.
   // This call is relatively expensive in threaded compositing mode,
   // as it blocks on the compositor thread.
   void GetRenderingStats(WebKit::WebRenderingStats&) const;
 
+  // Callback for use with BeginSmoothScroll.
+  typedef base::Callback<void()> SmoothScrollCompletionCallback;
+
   // Directs the host to begin a smooth scroll. This scroll should have the same
-  // performance characteristics as a user-initiated scroll.
-  void BeginSmoothScroll(bool scroll_down, bool scroll_far);
+  // performance characteristics as a user-initiated scroll. Returns an ID of
+  // the scroll gesture.
+  void BeginSmoothScroll(bool scroll_down,
+                         bool scroll_far,
+                         const SmoothScrollCompletionCallback& callback);
 
   // Close the underlying WebWidget.
   virtual void Close();
 
   float filtered_time_per_frame() const {
     return filtered_time_per_frame_;
   }
 
  protected:
   // Friend RefCounted so that the dtor can be non-public. Using this class
@@ skipping 83 matching lines @@
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end);
   virtual void OnImeConfirmComposition(
       const string16& text, const ui::Range& replacement_range);
   void OnMsgPaintAtSize(const TransportDIB::Handle& dib_id,
                         int tag,
                         const gfx::Size& page_size,
                         const gfx::Size& desired_size);
   void OnMsgRepaint(const gfx::Size& size_to_paint);
+  void OnMsgSmoothScrollCompleted(int gesture_id);
   virtual void OnSetDeviceScaleFactor(float device_scale_factor);
   void OnSetTextDirection(WebKit::WebTextDirection direction);
   void OnGetFPS();
   void OnScreenInfoChanged(const WebKit::WebScreenInfo& screen_info);
 
   // Override points to notify derived classes that a paint has happened.
   // WillInitiatePaint happens when we're about to generate a new bitmap and
   // send it to the browser. DidInitiatePaint happens when that has completed,
   // and subsequent rendering won't affect the painted content. DidFlushPaint
   // happens once we've received the ACK that the screen has been updated.
@@ skipping 293 matching lines @@
   // Properties of the screen hosting this RenderWidget instance.
   WebKit::WebScreenInfo screen_info_;
 
   // The device scale factor. This value is computed from the DPI entries in
   // |screen_info_| on some platforms, and defaults to 1 on other platforms.
   float device_scale_factor_;
 
   // Specifies whether input event throttling is enabled for this widget.
   bool throttle_input_events_;
 
+  // State associated with the BeginSmoothScroll synthetic scrolling function.
+  int next_smooth_scroll_gesture_id_;
+  typedef std::map<int, SmoothScrollCompletionCallback>
+      PendingSmoothScrollGestureMap;
+  PendingSmoothScrollGestureMap pending_smooth_scroll_gestures_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_