Move middle-click autoscroll to synthetic fling.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 235 matching lines @@
 }
 
 void EventHandler::StartMiddleClickAutoscroll(LayoutObject* layout_object) {
   DCHECK(RuntimeEnabledFeatures::MiddleClickAutoscrollEnabled());
   if (!layout_object->IsBox())
     return;
   AutoscrollController* controller = scroll_manager_->GetAutoscrollController();
   if (!controller)
     return;
   controller->StartMiddleClickAutoscroll(
-      ToLayoutBox(layout_object),
-      mouse_event_manager_->LastKnownMousePosition());
+      layout_object->GetFrame(), mouse_event_manager_->LastKnownMousePosition(),
+      mouse_event_manager_->LastKnownMousePositionGlobal());
   mouse_event_manager_->InvalidateClick();
 }
 
 HitTestResult EventHandler::HitTestResultAtPoint(
     const LayoutPoint& point,
     HitTestRequest::HitTestRequestType hit_type,
     const LayoutSize& padding) {
   TRACE_EVENT0("blink", "EventHandler::hitTestResultAtPoint");
 
   DCHECK((hit_type & HitTestRequest::kListBased) || padding.IsEmpty());
@@ skipping 34 matching lines @@
 
   frame_->ContentLayoutItem().HitTest(result);
   if (!request.ReadOnly())
     frame_->GetDocument()->UpdateHoverActiveState(request,
                                                   result.InnerElement());
 
   return result;
 }
 
 void EventHandler::StopAutoscroll() {
+  scroll_manager_->StopMiddleClickAutoscroll();
   scroll_manager_->StopAutoscroll();
 }
 
 // TODO(bokan): This should be merged with logicalScroll assuming
 // defaultSpaceEventHandler's chaining scroll can be done crossing frames.
 bool EventHandler::BubblingScroll(ScrollDirection direction,
                                   ScrollGranularity granularity,
                                   Node* starting_node) {
   return scroll_manager_->BubblingScroll(
       direction, granularity, starting_node,
@@ skipping 321 matching lines @@
       .GetEventHandler()
       .last_mouse_down_user_gesture_token_ =
       UserGestureIndicator::CurrentToken();
 
   if (RuntimeEnabledFeatures::MiddleClickAutoscrollEnabled()) {
     // We store whether middle click autoscroll is in progress before calling
     // stopAutoscroll() because it will set m_autoscrollType to NoAutoscroll on
     // return.
     bool is_middle_click_autoscroll_in_progress =
         scroll_manager_->MiddleClickAutoscrollInProgress();
-    scroll_manager_->StopAutoscroll();
+    scroll_manager_->StopMiddleClickAutoscroll();
     if (is_middle_click_autoscroll_in_progress) {
       // We invalidate the click when exiting middle click auto scroll so that
       // we don't inadvertently navigate away from the current page (e.g. the
       // click was on a hyperlink). See <rdar://problem/6095023>.
       mouse_event_manager_->InvalidateClick();
       return WebInputEventResult::kHandledSuppressed;
     }
   }
 
   mouse_event_manager_->SetClickCount(mouse_event.click_count);
@@ skipping 134 matching lines @@
   DCHECK(frame_->View());
 
   mouse_event_manager_->SetLastKnownMousePosition(mouse_event);
 
   hover_timer_.Stop();
   cursor_update_timer_.Stop();
 
   mouse_event_manager_->CancelFakeMouseMoveEvent();
   mouse_event_manager_->HandleSvgPanIfNeeded(false);
 
+  if (RuntimeEnabledFeatures::MiddleClickAutoscrollEnabled()) {
+    if (Page* page = frame_->GetPage()) {
+      if (mouse_event.GetType() == WebInputEvent::kMouseLeave &&
+          mouse_event.button != WebPointerProperties::Button::kMiddle) {
+        page->GetAutoscrollController().StopMiddleClickAutoscroll(frame_);
+      } else {
+        page->GetAutoscrollController().HandleMouseMoveForMiddleClickAutoscroll(
+            frame_, mouse_event_manager_->LastKnownMousePositionGlobal(),
+            mouse_event.button == WebPointerProperties::Button::kMiddle);
+      }
+    }
+  }
+
   if (frame_set_being_resized_) {
     return UpdatePointerTargetAndDispatchEvents(
         EventTypeNames::mousemove, frame_set_being_resized_.Get(), String(),
         mouse_event, coalesced_events);
   }
 
   // Send events right to a scrollbar if the mouse is pressed.
   if (last_scrollbar_under_mouse_ && mouse_event_manager_->MousePressed()) {
     last_scrollbar_under_mouse_->MouseMoved(mouse_event);
     return WebInputEventResult::kHandledSystem;
@@ skipping 111 matching lines @@
   // For 4th/5th button in the mouse since Chrome does not yet send
   // button value to Blink but in some cases it does send the event.
   // This check is needed to suppress such an event (crbug.com/574959)
   if (mouse_event.button == WebPointerProperties::Button::kNoButton)
     return WebInputEventResult::kHandledSuppressed;
 
   if (!mouse_event.FromTouch())
     frame_->Selection().SetCaretBlinkingSuspended(false);
 
   if (RuntimeEnabledFeatures::MiddleClickAutoscrollEnabled()) {
-    if (Page* page = frame_->GetPage())
+    if (Page* page = frame_->GetPage()) {
       page->GetAutoscrollController()
-          .HandleMouseReleaseForMiddleClickAutoscroll(frame_, mouse_event);
+          .HandleMouseReleaseForMiddleClickAutoscroll(
+              frame_,
+              mouse_event.button == WebPointerProperties::Button::kMiddle);
+    }
   }
 
   mouse_event_manager_->SetMousePressed(false);
   mouse_event_manager_->SetLastKnownMousePosition(mouse_event);
   mouse_event_manager_->HandleSvgPanIfNeeded(true);
 
   if (frame_set_being_resized_) {
     return mouse_event_manager_->SetMousePositionAndDispatchMouseEvent(
         UpdateMouseEventTargetNode(frame_set_being_resized_.Get()), String(),
         EventTypeNames::mouseup, mouse_event);
@@ skipping 1196 matching lines @@
     MouseEventWithHitTestResults& mev,
     LocalFrame* subframe) {
   WebInputEventResult result =
       subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
   if (result != WebInputEventResult::kNotHandled)
     return result;
   return WebInputEventResult::kHandledSystem;
 }
 
 }  // namespace blink