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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2815823003: Notify OverscrollController of gesture events in plugins. (Closed)
Patch Set: Address comments. Created 3 years, 7 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/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 80a0d1d9b598a392c7264970caac18f00a04fcd4..a019a92e9e72238c10e148b2a0c418d9a04976f7 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1117,6 +1117,14 @@ InputEventAckState RenderWidgetHostViewAura::FilterInputEvent(
: INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
}
+InputEventAckState RenderWidgetHostViewAura::FilterChildGestureEvent(
+ const blink::WebGestureEvent& gesture_event) {
+ if (overscroll_controller_ &&
+ overscroll_controller_->WillHandleEvent(gesture_event))
+ return INPUT_EVENT_ACK_STATE_CONSUMED;
+ return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+}
+
BrowserAccessibilityManager*
RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
BrowserAccessibilityDelegate* delegate, bool for_root_frame) {
@@ -2104,6 +2112,11 @@ void RenderWidgetHostViewAura::SetOverscrollControllerEnabled(bool enabled) {
overscroll_controller_.reset(new OverscrollController());
}
+void RenderWidgetHostViewAura::SetOverscrollControllerForTesting(
+ std::unique_ptr<OverscrollController> controller) {
+ overscroll_controller_ = std::move(controller);
+}
+
void RenderWidgetHostViewAura::SnapToPhysicalPixelBoundary() {
// The top left corner of our view in window coordinates might not land on a
// device pixel boundary if we have a non-integer device scale. In that case,

Powered by Google App Engine
This is Rietveld 408576698