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

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

Issue 2842203002: Forward GestureFlingStart in OOPIF, re-enable DCHECK. (Closed)
Patch Set: Add test descriptions, comment. Created 3 years, 8 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 | « no previous file | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/cross_process_frame_connector.cc
diff --git a/content/browser/frame_host/cross_process_frame_connector.cc b/content/browser/frame_host/cross_process_frame_connector.cc
index c281e18419794b67644e279a1312018b2015953b..5fc3c272ef19dfb3f5df3afda32797ba782d5477 100644
--- a/content/browser/frame_host/cross_process_frame_connector.cc
+++ b/content/browser/frame_host/cross_process_frame_connector.cc
@@ -183,7 +183,8 @@ void CrossProcessFrameConnector::ForwardProcessAckedTouchEvent(
void CrossProcessFrameConnector::BubbleScrollEvent(
const blink::WebGestureEvent& event) {
DCHECK(event.GetType() == blink::WebInputEvent::kGestureScrollUpdate ||
- event.GetType() == blink::WebInputEvent::kGestureScrollEnd);
+ event.GetType() == blink::WebInputEvent::kGestureScrollEnd ||
+ event.GetType() == blink::WebInputEvent::kGestureFlingStart);
auto* parent_view = GetParentRenderWidgetHostView();
if (!parent_view)
@@ -203,7 +204,8 @@ void CrossProcessFrameConnector::BubbleScrollEvent(
if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate) {
event_router->BubbleScrollEvent(parent_view, resent_gesture_event);
is_scroll_bubbling_ = true;
- } else if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd &&
+ } else if ((event.GetType() == blink::WebInputEvent::kGestureScrollEnd ||
+ event.GetType() == blink::WebInputEvent::kGestureFlingStart) &&
is_scroll_bubbling_) {
event_router->BubbleScrollEvent(parent_view, resent_gesture_event);
is_scroll_bubbling_ = false;
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698