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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.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/frame_host/render_widget_host_view_guest.cc
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
index b7e4883f030e2f8e444a85d9318ffd0b68f3a95e..65e14010cda60e28d95b39aebbaf471b83f72cd2 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -554,9 +554,38 @@ void RenderWidgetHostViewGuest::GestureEventAck(
ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
// GestureScrollBegin/End are always consumed by the guest, so we only
// forward GestureScrollUpdate.
+ // Consumed GestureScrollUpdates and GestureScrollBegins must still be
+ // forwarded to the owner RWHV so it may update its state.
if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate &&
- not_consumed)
+ not_consumed) {
guest_->ResendEventToEmbedder(event);
+ } else if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate ||
+ event.GetType() == blink::WebInputEvent::kGestureScrollBegin) {
+ GetOwnerRenderWidgetHostView()->GestureEventAck(event, ack_result);
+ }
+}
+
+InputEventAckState RenderWidgetHostViewGuest::FilterInputEvent(
+ const blink::WebInputEvent& input_event) {
+ InputEventAckState ack_state =
+ RenderWidgetHostViewChildFrame::FilterInputEvent(input_event);
+ if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED)
+ return ack_state;
+
+ // The owner RWHV may want to consume the guest's GestureScrollUpdates.
+ // Also, we don't resend GestureFlingStarts, GestureScrollBegins, or
+ // GestureScrollEnds, so we let the owner RWHV know about them here.
+ if (input_event.GetType() == blink::WebInputEvent::kGestureScrollUpdate ||
+ input_event.GetType() == blink::WebInputEvent::kGestureFlingStart ||
+ input_event.GetType() == blink::WebInputEvent::kGestureScrollBegin ||
+ input_event.GetType() == blink::WebInputEvent::kGestureScrollEnd) {
+ const blink::WebGestureEvent& gesture_event =
+ static_cast<const blink::WebGestureEvent&>(input_event);
+ return GetOwnerRenderWidgetHostView()->FilterChildGestureEvent(
+ gesture_event);
+ }
+
+ return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
}
bool RenderWidgetHostViewGuest::IsRenderWidgetHostViewGuest() {
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_guest.h ('k') | content/browser/renderer_host/overscroll_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698