Splits SmoothGestureController from RenderWidgetHostImpl

content/renderer/render_widget.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/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 143 matching lines @@
       can_compose_inline_(true),
       popup_type_(popup_type),
       pending_window_rect_count_(0),
       suppress_next_char_events_(false),
       is_accelerated_compositing_active_(false),
       animation_update_pending_(false),
       invalidation_task_posted_(false),
       screen_info_(screen_info),
       device_scale_factor_(screen_info_.deviceScaleFactor),
       throttle_input_events_(true),
-      next_smooth_scroll_gesture_id_(0),
       is_threaded_compositing_enabled_(false) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
   has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGpuVsync);
   is_threaded_compositing_enabled_ =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableThreadedCompositing);
 }
@@ skipping 1555 matching lines @@
   if (is_accelerated_compositing_active_) {
     if (compositor_)
       compositor_->setNeedsRedraw();
     scheduleComposite();
   } else {
     gfx::Rect repaint_rect(size_to_paint.width(), size_to_paint.height());
     didInvalidateRect(repaint_rect);
   }
 }
 
-void RenderWidget::OnSmoothScrollCompleted(int gesture_id) {
-  PendingSmoothScrollGestureMap::iterator it =
-      pending_smooth_scroll_gestures_.find(gesture_id);
-  DCHECK(it != pending_smooth_scroll_gestures_.end());
-  it->second.Run();
-  pending_smooth_scroll_gestures_.erase(it);
+void RenderWidget::OnSmoothScrollCompleted() {
+  pending_smooth_scroll_gesture_.Run();
 }
 
 void RenderWidget::OnSetTextDirection(WebTextDirection direction) {
   if (!webwidget_)
     return;
   webwidget_->setTextDirection(direction);
 }
 
 void RenderWidget::OnScreenInfoChanged(
     const WebKit::WebScreenInfo& screen_info) {
@@ skipping 338 matching lines @@
 }
 
 bool RenderWidget::GetGpuRenderingStats(GpuRenderingStats* stats) const {
   GpuChannelHost* gpu_channel = RenderThreadImpl::current()->GetGpuChannel();
   if (!gpu_channel)
     return false;
 
   return gpu_channel->CollectRenderingStatsForSurface(surface_id(), stats);
 }
 
-void RenderWidget::BeginSmoothScroll(
+bool RenderWidget::BeginSmoothScroll(
     bool down,
     const SmoothScrollCompletionCallback& callback,
     int pixels_to_scroll,
     int mouse_event_x,
     int mouse_event_y) {
   DCHECK(!callback.is_null());
-  int id = next_smooth_scroll_gesture_id_++;
 
   ViewHostMsg_BeginSmoothScroll_Params params;
   params.scroll_down = down;
   params.pixels_to_scroll = pixels_to_scroll;
   params.mouse_event_x = mouse_event_x;
   params.mouse_event_y = mouse_event_y;
 
-  Send(new ViewHostMsg_BeginSmoothScroll(routing_id_, id, params));
-  pending_smooth_scroll_gestures_.insert(std::make_pair(id, callback));
+  bool ret = false;
+  Send(new ViewHostMsg_BeginSmoothScroll(routing_id_, params, &ret));
+  pending_smooth_scroll_gesture_ = callback;
+  return ret;
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WillHandleGestureEvent(
     const WebKit::WebGestureEvent& event) {
   return false;
 }
 
 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {
   return true;
 }
 
 }  // namespace content