Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: content/renderer/render_widget.h

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Account for the fact that OOPIF subframes don't have an InnerViewportScrollLayer. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index c446998493b5356cbc81c1b77692d27cc02a605a..573577fe45b8b51b8f433cd3f0455b9e9f5f06ce 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -19,6 +19,7 @@
#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"
@@ -69,6 +70,7 @@ namespace blink {
namespace scheduler {
class RenderWidgetSchedulingState;
}
+struct WebActiveWheelFlingParameters;
struct WebDeviceEmulationParams;
class WebDragData;
class WebFrameWidget;
@@ -412,6 +414,9 @@ class CONTENT_EXPORT RenderWidget
// Helper to convert |point| using ConvertWindowToViewport().
gfx::Point ConvertWindowPointToViewport(const gfx::Point& point);
+ 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.
@@ -787,6 +792,8 @@ class CONTENT_EXPORT RenderWidget
// 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.
@@ -838,6 +845,8 @@ class CONTENT_EXPORT RenderWidget
// session, this info is sent to the browser along with other drag/drop info.
DragEventSourceInfo possible_drag_event_info_;
+ base::WeakPtrFactory<RenderWidget> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(RenderWidget);
};

Powered by Google App Engine
This is Rietveld 408576698