Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: Source/core/editing/SelectionController.h

Issue 1195213002: Clean up the SelectionControl class with c++11 enum class (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2015 Google Inc. All rights reserved. 3 * Copyright (C) 2015 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 bool handleMousePressEventSingleClick(const MouseEventWithHitTestResults&); 50 bool handleMousePressEventSingleClick(const MouseEventWithHitTestResults&);
51 bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&); 51 bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&);
52 bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&); 52 bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&);
53 void handleMouseDraggedEvent(const MouseEventWithHitTestResults&, const IntP oint&, const LayoutPoint&, Node*, const IntPoint&); 53 void handleMouseDraggedEvent(const MouseEventWithHitTestResults&, const IntP oint&, const LayoutPoint&, Node*, const IntPoint&);
54 bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&, const Layo utPoint&); 54 bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&, const Layo utPoint&);
55 bool handlePasteGlobalSelection(const PlatformMouseEvent&); 55 bool handlePasteGlobalSelection(const PlatformMouseEvent&);
56 bool handleGestureLongPress(const PlatformGestureEvent&, const HitTestResult &); 56 bool handleGestureLongPress(const PlatformGestureEvent&, const HitTestResult &);
57 57
58 void updateSelectionForMouseDrag(Node*, const LayoutPoint&, const IntPoint&) ; 58 void updateSelectionForMouseDrag(Node*, const LayoutPoint&, const IntPoint&) ;
59 void updateSelectionForMouseDrag(const HitTestResult&, Node*, const LayoutPo int&, const IntPoint&); 59 void updateSelectionForMouseDrag(const HitTestResult&, Node*, const LayoutPo int&, const IntPoint&);
60 void sendContextMenuEvent(const MouseEventWithHitTestResults&, const LayoutP oint&); 60 void prepareForContextMenu(const MouseEventWithHitTestResults&, const Layout Point&);
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.
61 void passMousePressEventToSubframe(const MouseEventWithHitTestResults&); 61 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
62 62
63 void initializeSelectionState(); 63 void initializeSelectionState();
64 void setMouseDownMayStartSelect(bool); 64 void setMouseDownMayStartSelect(bool);
65 bool mouseDownMayStartSelect() const; 65 bool mouseDownMayStartSelect() const;
66 bool mouseDownWasSingleClickInSelection() const; 66 bool mouseDownWasSingleClickInSelection() const;
67 67
68 private: 68 private:
69 explicit SelectionController(LocalFrame&); 69 explicit SelectionController(LocalFrame&);
70 70
71 template <typename Strategy> 71 template <typename Strategy>
72 bool handleMousePressEventSingleClickAlgorithm(const MouseEventWithHitTestRe sults&); 72 bool handleMousePressEventSingleClickAlgorithm(const MouseEventWithHitTestRe sults&);
73 73
74 template <typename Strategy> 74 template <typename Strategy>
75 void updateSelectionForMouseDragAlgorithm(const HitTestResult&, Node*, const LayoutPoint&, const IntPoint&); 75 void updateSelectionForMouseDragAlgorithm(const HitTestResult&, Node*, const LayoutPoint&, const IntPoint&);
76 76
77 enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTr ailingWhitespace }; 77 enum class AppendTrailingWhitespace { ShouldAppend, DontAppend };
78 void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailing Whitespace); 78 void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailing Whitespace);
79 void selectClosestMisspellingFromHitTestResult(const HitTestResult&, AppendT railingWhitespace); 79 void selectClosestMisspellingFromHitTestResult(const HitTestResult&, AppendT railingWhitespace);
80 void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&); 80 void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
81 void selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResul ts&); 81 void selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResul ts&);
82 void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResult s&); 82 void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResult s&);
83 83
84 FrameSelection& selection() const;
84 85
85 RawPtrWillBeMember<LocalFrame> const m_frame; 86 RawPtrWillBeMember<LocalFrame> const m_frame;
86 bool m_mouseDownMayStartSelect; 87 bool m_mouseDownMayStartSelect;
87 bool m_mouseDownWasSingleClickInSelection; 88 bool m_mouseDownWasSingleClickInSelection;
88 enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, Extend edSelection }; 89 enum class SelectionState { HaveNotStartedSelection, PlacedCaret, ExtendedSe lection };
89 SelectionInitiationState m_selectionInitiationState; 90 SelectionState m_selectionState;
90 }; 91 };
91 92
92 } // namespace blink 93 } // namespace blink
93 #endif // SelectionController_h 94 #endif // SelectionController_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/editing/SelectionController.cpp » ('j') | Source/core/editing/SelectionController.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698