Index: third_party/WebKit/Source/core/input/EventHandler.cpp |
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp |
index 6b7dbae6315f52828a398c5d4a45c876dbe87ed4..ffda23a2088ed708a140f4df65e770cf5b5ee176 100644 |
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp |
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp |
@@ -213,6 +213,7 @@ DEFINE_TRACE(EventHandler) { |
visitor->Trace(last_mouse_move_event_subframe_); |
visitor->Trace(last_scrollbar_under_mouse_); |
visitor->Trace(drag_target_); |
+ visitor->Trace(wheel_target_); |
visitor->Trace(frame_set_being_resized_); |
visitor->Trace(scroll_manager_); |
visitor->Trace(mouse_event_manager_); |
@@ -230,6 +231,7 @@ void EventHandler::Clear() { |
last_scrollbar_under_mouse_ = nullptr; |
frame_set_being_resized_ = nullptr; |
drag_target_ = nullptr; |
+ wheel_target_ = nullptr; |
should_only_fire_drag_over_event_ = false; |
last_mouse_down_user_gesture_token_.Clear(); |
capturing_mouse_events_node_ = nullptr; |
@@ -1265,45 +1267,96 @@ WebInputEventResult EventHandler::UpdatePointerTargetAndDispatchEvents( |
WebInputEventResult EventHandler::HandleWheelEvent( |
const WebMouseWheelEvent& event) { |
+ bool wheel_scroll_latching = |
+ RuntimeEnabledFeatures::TouchpadAndWheelScrollLatchingEnabled(); |
+ |
+ if (wheel_scroll_latching) { |
+ const int kWheelEventPhaseNoEventMask = |
+ WebMouseWheelEvent::kPhaseEnded | WebMouseWheelEvent::kPhaseCancelled | |
+ WebMouseWheelEvent::kPhaseMayBegin; |
+ |
+ if ((event.phase & kWheelEventPhaseNoEventMask) || |
+ (event.momentum_phase & kWheelEventPhaseNoEventMask)) { |
+ // Filter wheel events with zero deltas and reset the wheel_target_ node. |
+ DCHECK(!event.delta_x && !event.delta_y); |
+ wheel_target_ = nullptr; |
+ return WebInputEventResult::kNotHandled; |
+ } |
+ |
+ if (event.phase == WebMouseWheelEvent::kPhaseBegan) { |
+ // Find and save the wheel_target_, this target will be used for the rest |
+ // of the current scrolling sequence. |
+ DCHECK(!wheel_target_); |
+ Document* doc = frame_->GetDocument(); |
+ |
+ if (doc->GetLayoutViewItem().IsNull()) |
+ return WebInputEventResult::kNotHandled; |
+ |
+ LocalFrameView* view = frame_->View(); |
+ if (!view) |
+ return WebInputEventResult::kNotHandled; |
+ |
+ LayoutPoint v_point = view->RootFrameToContents( |
+ FlooredIntPoint(event.PositionInRootFrame())); |
+ |
+ HitTestRequest request(HitTestRequest::kReadOnly); |
+ HitTestResult result(request, v_point); |
+ doc->GetLayoutViewItem().HitTest(result); |
+ |
+ wheel_target_ = result.InnerNode(); |
+ // Wheel events should not dispatch to text nodes. |
+ if (wheel_target_ && wheel_target_->IsTextNode()) |
+ wheel_target_ = FlatTreeTraversal::Parent(*wheel_target_); |
+ |
+ // If we're over the frame scrollbar, scroll the document. |
+ if (!wheel_target_ && result.GetScrollbar()) |
+ wheel_target_ = doc->documentElement(); |
+ } |
+ } else { // !wheel_scroll_latching, wheel_target_ will be updated for each |
+ // wheel event. |
#if OS(MACOSX) |
- // Filter Mac OS specific phases, usually with a zero-delta. |
- // https://crbug.com/553732 |
- // TODO(chongz): EventSender sends events with |
- // |WebMouseWheelEvent::PhaseNone|, |
- // but it shouldn't. |
- const int kWheelEventPhaseNoEventMask = WebMouseWheelEvent::kPhaseEnded | |
- WebMouseWheelEvent::kPhaseCancelled | |
- WebMouseWheelEvent::kPhaseMayBegin; |
- if ((event.phase & kWheelEventPhaseNoEventMask) || |
- (event.momentum_phase & kWheelEventPhaseNoEventMask)) |
- return WebInputEventResult::kNotHandled; |
+ // Filter Mac OS specific phases, usually with a zero-delta. |
+ // https://crbug.com/553732 |
+ // TODO(chongz): EventSender sends events with |
+ // |WebMouseWheelEvent::PhaseNone|, |
+ // but it shouldn't. |
+ const int kWheelEventPhaseNoEventMask = |
+ WebMouseWheelEvent::kPhaseEnded | WebMouseWheelEvent::kPhaseCancelled | |
+ WebMouseWheelEvent::kPhaseMayBegin; |
+ if ((event.phase & kWheelEventPhaseNoEventMask) || |
+ (event.momentum_phase & kWheelEventPhaseNoEventMask)) |
+ return WebInputEventResult::kNotHandled; |
#endif |
- Document* doc = frame_->GetDocument(); |
- if (doc->GetLayoutViewItem().IsNull()) |
- return WebInputEventResult::kNotHandled; |
+ Document* doc = frame_->GetDocument(); |
- LocalFrameView* view = frame_->View(); |
- if (!view) |
- return WebInputEventResult::kNotHandled; |
+ if (doc->GetLayoutViewItem().IsNull()) |
+ return WebInputEventResult::kNotHandled; |
- LayoutPoint v_point = |
- view->RootFrameToContents(FlooredIntPoint(event.PositionInRootFrame())); |
+ LocalFrameView* view = frame_->View(); |
+ if (!view) |
+ return WebInputEventResult::kNotHandled; |
- HitTestRequest request(HitTestRequest::kReadOnly); |
- HitTestResult result(request, v_point); |
- doc->GetLayoutViewItem().HitTest(result); |
+ LayoutPoint v_point = |
+ view->RootFrameToContents(FlooredIntPoint(event.PositionInRootFrame())); |
+ |
+ HitTestRequest request(HitTestRequest::kReadOnly); |
+ HitTestResult result(request, v_point); |
+ doc->GetLayoutViewItem().HitTest(result); |
- Node* node = result.InnerNode(); |
- // Wheel events should not dispatch to text nodes. |
- if (node && node->IsTextNode()) |
- node = FlatTreeTraversal::Parent(*node); |
+ Node* node = result.InnerNode(); |
+ // Wheel events should not dispatch to text nodes. |
+ if (node && node->IsTextNode()) |
+ node = FlatTreeTraversal::Parent(*node); |
- // If we're over the frame scrollbar, scroll the document. |
- if (!node && result.GetScrollbar()) |
- node = doc->documentElement(); |
+ // If we're over the frame scrollbar, scroll the document. |
+ if (!node && result.GetScrollbar()) |
+ node = doc->documentElement(); |
+ |
+ wheel_target_ = node; |
+ } |
- LocalFrame* subframe = SubframeForTargetNode(node); |
+ LocalFrame* subframe = SubframeForTargetNode(wheel_target_.Get()); |
if (subframe) { |
WebInputEventResult result = |
subframe->GetEventHandler().HandleWheelEvent(event); |
@@ -1312,10 +1365,11 @@ WebInputEventResult EventHandler::HandleWheelEvent( |
return result; |
} |
- if (node) { |
+ if (wheel_target_) { |
WheelEvent* dom_event = |
- WheelEvent::Create(event, node->GetDocument().domWindow()); |
- DispatchEventResult dom_event_result = node->DispatchEvent(dom_event); |
+ WheelEvent::Create(event, wheel_target_->GetDocument().domWindow()); |
+ DispatchEventResult dom_event_result = |
+ wheel_target_->DispatchEvent(dom_event); |
if (dom_event_result != DispatchEventResult::kNotCanceled) |
return EventHandlingUtil::ToWebInputEventResult(dom_event_result); |
} |