Chromium Code Reviews| Index: Source/core/editing/SelectionController.h |
| diff --git a/Source/core/editing/SelectionController.h b/Source/core/editing/SelectionController.h |
| index e4649efab71243d72e29f328307cbba570847b91..19d731ce0cb5ae51c3d97202178b3a324aa93830 100644 |
| --- a/Source/core/editing/SelectionController.h |
| +++ b/Source/core/editing/SelectionController.h |
| @@ -57,8 +57,8 @@ public: |
| void updateSelectionForMouseDrag(Node*, const LayoutPoint&, const IntPoint&); |
| void updateSelectionForMouseDrag(const HitTestResult&, Node*, const LayoutPoint&, const IntPoint&); |
| - void sendContextMenuEvent(const MouseEventWithHitTestResults&, const LayoutPoint&); |
| - void passMousePressEventToSubframe(const MouseEventWithHitTestResults&); |
| + void prepareForContextMenu(const MouseEventWithHitTestResults&, const LayoutPoint&); |
|
yosin_UTC9
2015/06/22 05:31:11
I think we don't need to rename this function.
Miyoung Shin(c)
2015/06/24 07:43:27
OK.
|
| + void preparePassMousePressEventToSubframe(const MouseEventWithHitTestResults&); |
|
yosin_UTC9
2015/06/22 05:31:11
I think we don't need to rename this function.
Miyoung Shin(c)
2015/06/24 07:43:27
OK
|
| void initializeSelectionState(); |
| void setMouseDownMayStartSelect(bool); |
| @@ -74,19 +74,20 @@ private: |
| template <typename Strategy> |
| void updateSelectionForMouseDragAlgorithm(const HitTestResult&, Node*, const LayoutPoint&, const IntPoint&); |
| - enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace }; |
| + enum class AppendTrailingWhitespace { ShouldAppend, DontAppend }; |
| void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace); |
| void selectClosestMisspellingFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace); |
| void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&); |
| void selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResults&); |
| void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&); |
| + FrameSelection& selection() const; |
| RawPtrWillBeMember<LocalFrame> const m_frame; |
| bool m_mouseDownMayStartSelect; |
| bool m_mouseDownWasSingleClickInSelection; |
| - enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection }; |
| - SelectionInitiationState m_selectionInitiationState; |
| + enum class SelectionState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection }; |
| + SelectionState m_selectionState; |
| }; |
| } // namespace blink |