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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.cc

Issue 1377173005: Make sure fast-path scrolls bubble on non-scrollable guest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment. Created 5 years, 3 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
« no previous file with comments | « chrome/test/data/extensions/platform_apps/web_view/scrollable_embedder_and_guest/main.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b44f219e7d5d94b96148cca32a912ff9119af2b9..ecda893dbb7412751162963686973d62d004e4c3 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -632,14 +632,17 @@ RenderWidgetHostViewGuest::GetOwnerRenderWidgetHostView() const {
void RenderWidgetHostViewGuest::WheelEventAck(
const blink::WebMouseWheelEvent& event,
InputEventAckState ack_result) {
- if (ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED)
+ if (ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED ||
+ ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) {
guest_->ResendEventToEmbedder(event);
+ }
}
void RenderWidgetHostViewGuest::GestureEventAck(
const blink::WebGestureEvent& event,
InputEventAckState ack_result) {
- bool not_consumed = INPUT_EVENT_ACK_STATE_NOT_CONSUMED == ack_result;
+ bool not_consumed = ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED ||
+ ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
// GestureScrollBegin/End are always consumed by the guest, so we only
// forward GestureScrollUpdate.
if (event.type == blink::WebInputEvent::GestureScrollUpdate && not_consumed)
« no previous file with comments | « chrome/test/data/extensions/platform_apps/web_view/scrollable_embedder_and_guest/main.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698