Move compositor InputHandler from RenderViewImpl to RenderWidget.

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 <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <map>
 #include <memory>
 #include <queue>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/public/common/screen_info.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delegate.h"
 #include "content/renderer/gpu/render_widget_compositor_delegate.h"
@@ skipping 27 matching lines @@
 
 namespace IPC {
 class SyncMessage;
 class SyncMessageFilter;
 }
 
 namespace blink {
 namespace scheduler {
 class RenderWidgetSchedulingState;
 }
+struct WebActiveWheelFlingParameters;
 struct WebDeviceEmulationParams;
 class WebFrameWidget;
 class WebGestureEvent;
 class WebLocalFrame;
 class WebMouseEvent;
 class WebNode;
+class WebURL;
 struct WebPoint;
 }
 
 namespace cc {
 class CompositorFrameSink;
 class FrameSinkId;
 class SwapPromise;
 }
 
 namespace gfx {
@@ skipping 28 matching lines @@
 // - Fullscreen mode (RenderWidgetFullScreen)
 // - Popup "menus" (like the color chooser and date picker)
 // - Widgets for frames (for out-of-process iframe support)
 class CONTENT_EXPORT RenderWidget
     : public IPC::Listener,
       public IPC::Sender,
       NON_EXPORTED_BASE(virtual public blink::WebWidgetClient),
       public RenderWidgetCompositorDelegate,
       public RenderWidgetInputHandlerDelegate,
       public RenderWidgetScreenMetricsEmulatorDelegate,
+      public base::SupportsWeakPtr<RenderWidget>,

[dcheng, 2016/11/04 21:00:02]

Let's embed a WeakPtrFactory instead.

[wjmaclean, 2016/11/07 15:57:27]

Done.

       public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside.
   static RenderWidget* Create(int32_t opener_id,
                               CompositorDependencies* compositor_deps,
                               blink::WebPopupType popup_type,
                               const ScreenInfo& screen_info);
 
   // Creates a new RenderWidget that will be attached to a RenderFrame.
@@ skipping 257 matching lines @@
   // TODO(ekaramad): The reference to the focused pepper plugin will be removed
   // from RenderWidget. The purpose of having the reference here was to make IME
   // work for OOPIF (https://crbug.com/643727).
   void set_focused_pepper_plugin(PepperPluginInstanceImpl* plugin) {
     focused_pepper_plugin_ = plugin;
   }
 
   // When emulated, this returns original device scale factor.
   float GetOriginalDeviceScaleFactor() const;
 
+  virtual void TransferActiveWheelFlingAnimation(
+      const blink::WebActiveWheelFlingParameters& params) {}
+
  protected:
   // Friend RefCounted so that the dtor can be non-public. Using this class
   // without ref-counting is an error.
   friend class base::RefCounted<RenderWidget>;
 
   // For unit tests.
   friend class RenderWidgetTest;
 
   using CreateWidgetCallback = base::OnceCallback<bool()>;
 
@@ skipping 93 matching lines @@
 
 #if defined(OS_ANDROID)
   // Called when we send IME event that expects an ACK.
   void OnImeEventSentForAck(const blink::WebTextInputInfo& info);
 
   // Called by the browser process for every required IME acknowledgement.
   void OnImeEventAck();
 
   // Called by the browser process to update text input state.
   void OnRequestTextInputStateUpdate();
+
+  // Declared here to allow use of RenderWidget weak pointer. Overriden in
+  // RenderViewImpl.
+  virtual void LaunchAndroidContentIntent(const GURL& intent,
+                                          size_t request_id,
+                                          bool is_main_frame) {}
+
+  // Utility function so LaunchAndroidContentIntent can remain protected.
+  void scheduleContentIntentForRenderView(const blink::WebURL& intent,
+                                          bool is_main_frame,
+                                          size_t expected_content_intent_id);
 #endif
 
   // Called by the browser process to update the cursor and composition
   // information.
   void OnRequestCompositionUpdate(bool immediate_request, bool monitor_request);
 
   // Notify the compositor about a change in viewport size. This should be
   // used only with auto resize mode WebWidgets, as normal WebWidgets should
   // go through OnResize.
   void AutoResizeCompositor();
@@ skipping 259 matching lines @@
 
   std::unique_ptr<blink::scheduler::RenderWidgetSchedulingState>
       render_widget_scheduling_state_;
 
   // Mouse Lock dispatcher attached to this view.
   std::unique_ptr<RenderWidgetMouseLockDispatcher> mouse_lock_dispatcher_;
 
   // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
   std::unique_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
 
+  bool has_added_input_handler_;
+
  private:
   // Applies/Removes the DevTools device emulation transformation to/from a
   // window rect.
   void ScreenRectToEmulatedIfNeeded(blink::WebRect* window_rect) const;
   void EmulatedToScreenRectIfNeeded(blink::WebRect* window_rect) const;
 
   bool CreateWidget(int32_t opener_id,
                     blink::WebPopupType popup_type,
                     int32_t* routing_id);
 
@@ skipping 13 matching lines @@
   // Stores edit commands associated to the next key event.
   // Will be cleared as soon as the next key event is processed.
   EditCommands edit_commands_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_