Chromium Code Reviews| Index: Source/core/page/EventHandler.h |
| diff --git a/Source/core/page/EventHandler.h b/Source/core/page/EventHandler.h |
| index a2314445140e2e5224e4b092500258fd976636db..85d8d11878bbeb26c5ee1638e424020a1c0356df 100644 |
| --- a/Source/core/page/EventHandler.h |
| +++ b/Source/core/page/EventHandler.h |
| @@ -27,7 +27,6 @@ |
| #define EventHandler_h |
| #include "core/CoreExport.h" |
| -#include "core/editing/TextGranularity.h" |
| #include "core/events/TextEventInputType.h" |
| #include "core/layout/HitTestRequest.h" |
| #include "core/style/ComputedStyleConstants.h" |
| @@ -76,12 +75,11 @@ class LayoutObject; |
| class ScrollableArea; |
| class Scrollbar; |
| class ScrollState; |
| +class SelectionController; |
| class TextEvent; |
| -class VisibleSelection; |
| class WheelEvent; |
| class Widget; |
| -enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace }; |
| enum class DragInitiator; |
| class CORE_EXPORT EventHandler : public NoBaseWillBeGarbageCollectedFinalized<EventHandler> { |
| @@ -198,31 +196,20 @@ public: |
| PassRefPtr<UserGestureToken> takeLastMouseDownGestureToken() { return m_lastMouseDownUserGestureToken.release(); } |
| int clickCount() { return m_clickCount; } |
| - bool mouseDownWasSingleClickInSelection() { return m_mouseDownWasSingleClickInSelection; } |
| + |
| + SelectionController& selectionController() const { 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&); |
| @@ -241,8 +228,6 @@ private: |
| void cursorUpdateTimerFired(Timer<EventHandler>*); |
| void activeIntervalTimerFired(Timer<EventHandler>*); |
| - bool mouseDownMayStartSelect() const { return m_mouseDownMayStartSelect; } |
| - |
| void fakeMouseMoveEventTimerFired(Timer<EventHandler>*); |
| void cancelFakeMouseMoveEvent(); |
| bool isCursorVisible() const; |
| @@ -305,8 +290,6 @@ private: |
| void defaultEscapeEventHandler(KeyboardEvent*); |
| void defaultArrowEventHandler(WebFocusType, KeyboardEvent*); |
| - void updateSelectionForMouseDrag(const HitTestResult&); |
| - |
| void updateLastScrollbarUnderMouse(Scrollbar*, bool); |
| void setFrameWasScrolledByUser(); |
| @@ -338,11 +321,8 @@ private: |
| bool m_capturesDragging; |
| RefPtrWillBeMember<Node> m_mousePressNode; |
| - bool m_mouseDownMayStartSelect; |
| bool m_mouseDownMayStartDrag; |
| - bool m_mouseDownWasSingleClickInSelection; |
| - enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection }; |
| - SelectionInitiationState m_selectionInitiationState; |
| + const OwnPtr<SelectionController> m_selectionController; |
|
tkent
2015/05/20 03:31:01
should be |OwnPtrWIllBeMember|, and needs to updat
Miyoung Shin(g)
2015/05/20 15:53:40
Done.
|
| LayoutPoint m_dragStartPos; |