Tie DragState to DragController.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/MouseEventManager.h"
 
 #include "core/clipboard/DataObject.h"
 #include "core/clipboard/DataTransfer.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
@@ skipping 538 matching lines @@
   if (!quad.containsPoint(view->rootFrameToContents(m_lastKnownMousePosition)))
     return;
 
   dispatchFakeMouseMoveEventSoon();
 }
 
 WebInputEventResult MouseEventManager::handleMousePressEvent(
     const MouseEventWithHitTestResults& event) {
   TRACE_EVENT0("blink", "MouseEventManager::handleMousePressEvent");
 
-  // Reset drag state.
-  dragState().m_dragSrc = nullptr;
-
+  resetDragState();
   cancelFakeMouseMoveEvent();
 
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (FrameView* frameView = m_frame->view()) {
     if (frameView->isPointInScrollbarCorner(
             flooredIntPoint(event.event().positionInRootFrame())))
       return WebInputEventResult::NotHandled;
   }
 
@@ skipping 93 matching lines @@
         WebInputEvent::MouseMove, gestureEvent,
         WebPointerProperties::Button::Left, 1,
         modifiers | WebInputEvent::Modifiers::LeftButtonDown |
             WebInputEvent::Modifiers::IsCompatibilityEventForTouch,
         TimeTicks::Now().InSeconds());
     HitTestRequest request(HitTestRequest::ReadOnly);
     MouseEventWithHitTestResults mev =
         EventHandlingUtil::performMouseEventHitTest(m_frame, request,
                                                     mouseDragEvent);
     m_mouseDownMayStartDrag = true;
-    dragState().m_dragSrc = nullptr;
+    resetDragState();
     m_mouseDownPos = m_frame->view()->rootFrameToContents(
         flooredIntPoint(mouseDragEvent.positionInRootFrame()));
     return handleDrag(mev, DragInitiator::Touch);
   }
   return false;
 }
 
 void MouseEventManager::focusDocumentView() {
   Page* page = m_frame->page();
   if (!page)
@@ skipping 85 matching lines @@
       DragController::SelectionDragPolicy selectionDragPolicy =
           TimeTicks::FromSeconds(event.event().timeStampSeconds()) -
                       m_mouseDownTimestamp <
                   kTextDragDelay
               ? DragController::DelayedSelectionDragResolution
               : DragController::ImmediateSelectionDragResolution;
       dragState().m_dragSrc = m_frame->page()->dragController().draggableNode(
           m_frame, node, m_mouseDownPos, selectionDragPolicy,
           dragState().m_dragType);
     } else {
-      dragState().m_dragSrc = nullptr;
+      resetDragState();
     }
 
     if (!dragState().m_dragSrc)
       m_mouseDownMayStartDrag = false;  // no element is draggable
   }
 
   if (!m_mouseDownMayStartDrag) {
     return initiator == DragInitiator::Mouse &&
            !m_frame->eventHandler()
                 .selectionController()
                 .mouseDownMayStartSelect() &&
            !m_mouseDownMayStartAutoscroll;
   }
 
   // We are starting a text/image/url drag, so the cursor should be an arrow
   // FIXME <rdar://7577595>: Custom cursors aren't supported during drag and
   // drop (default to pointer).
   m_frame->view()->setCursor(pointerCursor());
 
   if (initiator == DragInitiator::Mouse &&
       !dragThresholdExceeded(
           flooredIntPoint(event.event().positionInRootFrame()))) {
-    dragState().m_dragSrc = nullptr;
+    resetDragState();
     return true;
   }
 
   // Once we're past the drag threshold, we don't want to treat this gesture as
   // a click.
   invalidateClick();
 
   if (!tryStartDrag(event)) {
     // Something failed to start the drag, clean up.
     clearDragDataTransfer();
-    dragState().m_dragSrc = nullptr;
+    resetDragState();
   }
 
   m_mouseDownMayStartDrag = false;
   // Whether or not the drag actually started, no more default handling (like
   // selection).
   return true;
 }
 
 DataTransfer* MouseEventManager::createDraggingDataTransfer() const {
   return DataTransfer::create(DataTransfer::DragAndDrop, DataTransferWritable,
@@ skipping 89 matching lines @@
 }
 
 void MouseEventManager::dragSourceEndedAt(const WebMouseEvent& event,
                                           DragOperation operation) {
   if (dragState().m_dragSrc) {
     dragState().m_dragDataTransfer->setDestinationOperation(operation);
     // The return value is ignored because dragend is not cancelable.
     dispatchDragSrcEvent(EventTypeNames::dragend, event);
   }
   clearDragDataTransfer();
-  dragState().m_dragSrc = nullptr;
+  resetDragState();
   // In case the drag was ended due to an escape key press we need to ensure
   // that consecutive mousemove events don't reinitiate the drag and drop.
   m_mouseDownMayStartDrag = false;
 }
 
 DragState& MouseEventManager::dragState() {
-  DEFINE_STATIC_LOCAL(DragState, state, (new DragState));
-  return state;
+  DCHECK(m_frame->page());
+  return m_frame->page()->dragController().dragState();
+}
+
+void MouseEventManager::resetDragState() {
+  if (!m_frame->page())
+    return;
+  dragState().m_dragSrc = nullptr;
 }
 
 bool MouseEventManager::dragThresholdExceeded(
     const IntPoint& dragLocationInRootFrame) const {
   FrameView* view = m_frame->view();
   if (!view)
     return false;
   IntPoint dragLocation = view->rootFrameToContents(dragLocationInRootFrame);
   IntSize delta = dragLocation - m_mouseDownPos;
 
@@ skipping 59 matching lines @@
 
 void MouseEventManager::setClickCount(int clickCount) {
   m_clickCount = clickCount;
 }
 
 bool MouseEventManager::mouseDownMayStartDrag() {
   return m_mouseDownMayStartDrag;
 }
 
 }  // namespace blink