Revert 236254 "Replace old with new synthetic gesture framework."

trunk/src/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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "content/common/browser_rendering_stats.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
-#include "content/common/input/synthetic_gesture_params.h"
 #include "content/renderer/paint_aggregator.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "third_party/WebKit/public/web/WebTextInputInfo.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "third_party/WebKit/public/web/WebWidgetClient.h"
@@ skipping 140 matching lines @@
 
   void GetBrowserRenderingStats(BrowserRenderingStats* stats);
 
   RenderWidgetCompositor* compositor() const;
 
   virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback);
 
   // Callback for use with synthetic gestures (e.g. BeginSmoothScroll).
   typedef base::Callback<void()> SyntheticGestureCompletionCallback;
 
-  // Send a synthetic gesture to the browser to be queued to the synthetic
-  // gesture controller.
-  void QueueSyntheticGesture(
-      scoped_ptr<SyntheticGestureParams> gesture_params,
-      const SyntheticGestureCompletionCallback& callback);
+  // Directs the host to begin a smooth scroll. This scroll should have the same
+  // performance characteristics as a user-initiated scroll. Returns an ID of
+  // the scroll gesture. |mouse_event_x| and |mouse_event_y| are expected to be
+  // in local DIP coordinates.
+  void BeginSmoothScroll(bool scroll_down,
+                         const SyntheticGestureCompletionCallback& callback,
+                         int pixels_to_scroll,
+                         int mouse_event_x,
+                         int mouse_event_y);
+
+  // Directs the host to begin a pinch gesture. This gesture should have the
+  // same performance characteristics as a user-initiated pinch.
+  // |pixels_to_move|, |anchor_x| and |anchor_y| are expected to be in local
+  // DIP coordinates.
+  void BeginPinch(bool zoom_in,
+                  int pixels_to_move,
+                  int anchor_x,
+                  int anchor_y,
+                  const SyntheticGestureCompletionCallback& callback);
 
   // Close the underlying WebWidget.
   virtual void Close();
 
   // Notifies about a compositor frame commit operation having finished.
   virtual void DidCommitCompositorFrame();
 
   float filtered_time_per_frame() const {
     return filtered_time_per_frame_;
   }
@@ skipping 539 matching lines @@
   // case NULL is added to the queue.
   std::deque<ViewHostMsg_UpdateRect*> updates_pending_swap_;
 
   // Properties of the screen hosting this RenderWidget instance.
   blink::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_;
 
-  // State associated with synthetic gestures. Synthetic gestures are processed
-  // in-order, so a queue is sufficient to identify the correct state for a
-  // completed gesture.
-  std::queue<SyntheticGestureCompletionCallback>
-      pending_synthetic_gesture_callbacks_;
+  // State associated with the synthetic gestures function
+  // (e.g. BeginSmoothScroll).
+  SyntheticGestureCompletionCallback pending_synthetic_gesture_;
 
   // Specified whether the compositor will run in its own thread.
   bool is_threaded_compositing_enabled_;
 
   // The last set of rendering stats received from the browser. This is only
   // received when using the --enable-gpu-benchmarking flag.
   BrowserRenderingStats browser_rendering_stats_;
 
   // The latency information for any current non-accelerated-compositing
   // frame.
@@ skipping 17 matching lines @@
   float popup_origin_scale_for_emulation_;
 
   scoped_ptr<ResizingModeSelector> resizing_mode_selector_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_