[Reland] Refactor the selection code in EventHandler

Source/core/page/EventHandler.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef EventHandler_h
 #define EventHandler_h
 
 #include "core/CoreExport.h"
-#include "core/editing/TextGranularity.h"
+#include "core/editing/SelectionController.h"

[yosin_UTC9, 2015/05/18 08:53:47]

Let's use |OwnPtr<ScrollController| to avoid including "SelectionController.h"
here.

[Miyoung Shin(g), 2015/05/19 09:01:43]

Done.

 #include "core/events/TextEventInputType.h"
 #include "core/layout/HitTestRequest.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "core/page/DragActions.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "platform/Cursor.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/Timer.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/LayoutPoint.h"
@@ skipping 29 matching lines @@
 class OptionalCursor;
 class PlatformGestureEvent;
 class PlatformKeyboardEvent;
 class PlatformTouchEvent;
 class PlatformWheelEvent;
 class LayoutObject;
 class ScrollableArea;
 class Scrollbar;
 class ScrollState;
 class TextEvent;
-class VisibleSelection;
 class WheelEvent;
 class Widget;
 
-enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace };
 enum class DragInitiator;
 
 class CORE_EXPORT EventHandler : public NoBaseWillBeGarbageCollectedFinalized<EventHandler> {
     WTF_MAKE_NONCOPYABLE(EventHandler);
 public:
     explicit EventHandler(LocalFrame*);
     ~EventHandler();
     DECLARE_TRACE();
 
     void clear();
     void nodeWillBeRemoved(Node&);
 
-    void updateSelectionForMouseDrag();
-
 #if OS(WIN)
     void startPanScrolling(LayoutObject*);
 #endif
 
     void stopAutoscroll();
 
     void dispatchFakeMouseMoveEventSoon();
     void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
 
     HitTestResult hitTestResultAtPoint(const LayoutPoint&,
@@ skipping 80 matching lines @@
 
     bool handleTouchEvent(const PlatformTouchEvent&);
 
     bool useHandCursor(Node*, bool isOverLink);
 
     void notifyElementActivated();
 
     PassRefPtr<UserGestureToken> takeLastMouseDownGestureToken() { return m_lastMouseDownUserGestureToken.release(); }
 
     int clickCount() { return m_clickCount; }
-    bool mouseDownWasSingleClickInSelection() { return m_mouseDownWasSingleClickInSelection; }
+
+    void updateSelectionForMouseDrag();

[yosin_UTC9, 2015/05/18 08:53:47]

nit: Please move this to original position, e.g. L97.

[Miyoung Shin(g), 2015/05/19 09:01:43]

Done.

+    SelectionController& selectionController() { return m_selectionController; }
 
 private:
     static DragState& dragState();
 
     DataTransfer* createDraggingDataTransfer() const;
 
-    bool updateSelectionForMouseDownDispatchingSelectStart(Node*, const VisibleSelection&, TextGranularity);
-    void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace);
-    void selectClosestMisspellingFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace);
-    void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
-    void selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResults&);
-    void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&);
-
     bool handleMouseMoveOrLeaveEvent(const PlatformMouseEvent&, HitTestResult* hoveredNode = nullptr, bool onlyUpdateScrollbars = false, bool forceLeave = false);
     bool handleMousePressEvent(const MouseEventWithHitTestResults&);
-    bool handleMousePressEventSingleClick(const MouseEventWithHitTestResults&);
-    bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&);
-    bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&);
     bool handleMouseFocus(const MouseEventWithHitTestResults&);
     bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&);
     bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&);
 
-    bool handlePasteGlobalSelection(const PlatformMouseEvent&);
-
     HitTestRequest::HitTestRequestType getHitTypeForGestureType(PlatformEvent::Type);
     void applyTouchAdjustment(PlatformGestureEvent*, HitTestResult*);
     bool handleGestureTap(const GestureEventWithHitTestResults&);
     bool handleGestureLongPress(const GestureEventWithHitTestResults&);
     bool handleGestureLongTap(const GestureEventWithHitTestResults&);
     bool handleGestureScrollUpdate(const PlatformGestureEvent&);
     bool handleGestureScrollBegin(const PlatformGestureEvent&);
     void clearGestureScrollNodes();
 
     bool shouldApplyTouchAdjustment(const PlatformGestureEvent&) const;
 
     OptionalCursor selectCursor(const HitTestResult&);
     OptionalCursor selectAutoCursor(const HitTestResult&, Node*, const Cursor& iBeam);
 
     void hoverTimerFired(Timer<EventHandler>*);
     void cursorUpdateTimerFired(Timer<EventHandler>*);
     void activeIntervalTimerFired(Timer<EventHandler>*);
 
-    bool mouseDownMayStartSelect() const { return m_mouseDownMayStartSelect; }
-
     void fakeMouseMoveEventTimerFired(Timer<EventHandler>*);
     void cancelFakeMouseMoveEvent();
     bool isCursorVisible() const;
     void updateCursor();
 
     ScrollableArea* associatedScrollableArea(const DeprecatedPaintLayer*) const;
 
     // Scrolls the elements of the DOM tree. Returns true if a node was scrolled.
     // False if we reached the root and couldn't scroll anything.
     // direction - The direction to scroll in. If this is a logical direction, it will be
@@ skipping 42 matching lines @@
 
     bool passMousePressEventToScrollbar(MouseEventWithHitTestResults&);
 
     bool passWheelEventToWidget(const PlatformWheelEvent&, Widget&);
     void defaultSpaceEventHandler(KeyboardEvent*);
     void defaultBackspaceEventHandler(KeyboardEvent*);
     void defaultTabEventHandler(KeyboardEvent*);
     void defaultEscapeEventHandler(KeyboardEvent*);
     void defaultArrowEventHandler(WebFocusType, KeyboardEvent*);
 
-    void updateSelectionForMouseDrag(const HitTestResult&);
-
     void updateLastScrollbarUnderMouse(Scrollbar*, bool);
 
     void setFrameWasScrolledByUser();
 
     bool capturesDragging() const { return m_capturesDragging; }
 
     bool handleGestureShowPress();
 
     bool handleScrollGestureOnResizer(Node*, const PlatformGestureEvent&);
 
@@ skipping 11 matching lines @@
 
     // NOTE: If adding a new field to this class please ensure that it is
     // cleared in |EventHandler::clear()|.
 
     LocalFrame* const m_frame;
 
     bool m_mousePressed;
     bool m_capturesDragging;
     RefPtrWillBeMember<Node> m_mousePressNode;
 
-    bool m_mouseDownMayStartSelect;
     bool m_mouseDownMayStartDrag;
-    bool m_mouseDownWasSingleClickInSelection;
-    enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection };
-    SelectionInitiationState m_selectionInitiationState;
+    SelectionController m_selectionController;

[yosin_UTC9, 2015/05/18 08:53:47]

Let's use |const OwnPtr<SelectionController>|.

[Miyoung Shin(g), 2015/05/19 09:01:43]

Done.

 
     LayoutPoint m_dragStartPos;
 
     Timer<EventHandler> m_hoverTimer;
     Timer<EventHandler> m_cursorUpdateTimer;
 
     bool m_mouseDownMayStartAutoscroll;
 
     Timer<EventHandler> m_fakeMouseMoveEventTimer;
 
@@ skipping 66 matching lines @@
     // scroll sequence in this frame, or any child frames. Only used
     // with ScrollCustomization. If some delta has been consumed, a
     // scroll which shouldn't propagate can't cause any element to
     // scroll other than the |m_previousGestureScrolledNode|.
     bool m_deltaConsumedForScrollSequence;
 };
 
 } // namespace blink
 
 #endif // EventHandler_h