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

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

Issue 1321033002: Introduce {left,right}PositionOf() for VisiblePosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-28T21:59:15 Rebase after merge failure Created 5 years, 3 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
« no previous file with comments | « Source/core/editing/FrameSelection.cpp ('k') | Source/core/editing/VisiblePosition.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 Position toParentAnchoredPosition() const { return deepEquivalent().parentAn choredEquivalent(); } 93 Position toParentAnchoredPosition() const { return deepEquivalent().parentAn choredEquivalent(); }
94 PositionWithAffinity toPositionWithAffinity() const { return PositionWithAff inity(m_deepPosition, m_affinity); } 94 PositionWithAffinity toPositionWithAffinity() const { return PositionWithAff inity(m_deepPosition, m_affinity); }
95 TextAffinity affinity() const { return m_affinity; } 95 TextAffinity affinity() const { return m_affinity; }
96 96
97 // next() and previous() will increment/decrement by a character cluster. 97 // next() and previous() will increment/decrement by a character cluster.
98 VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition&) const ; 98 VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition&) const ;
99 VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition&) const; 99 VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition&) const;
100 VisiblePosition skipToStartOfEditingBoundary(const VisiblePosition&) const; 100 VisiblePosition skipToStartOfEditingBoundary(const VisiblePosition&) const;
101 VisiblePosition skipToEndOfEditingBoundary(const VisiblePosition&) const; 101 VisiblePosition skipToEndOfEditingBoundary(const VisiblePosition&) const;
102 102
103 VisiblePosition left() const; 103 // TODO(yosin) This does not handle [table, 0] correctly.
104 VisiblePosition right() const;
105
106 // FIXME: This does not handle [table, 0] correctly.
107 Element* rootEditableElement() const { return m_deepPosition.isNotNull() ? m _deepPosition.anchorNode()->rootEditableElement() : 0; } 104 Element* rootEditableElement() const { return m_deepPosition.isNotNull() ? m _deepPosition.anchorNode()->rootEditableElement() : 0; }
108 105
109 // Rect is local to the returned layoutObject 106 // Rect is local to the returned layoutObject
110 LayoutRect localCaretRect(LayoutObject*&) const; 107 LayoutRect localCaretRect(LayoutObject*&) const;
111 // Bounds of (possibly transformed) caret in absolute coords 108 // Bounds of (possibly transformed) caret in absolute coords
112 IntRect absoluteCaretBounds() const; 109 IntRect absoluteCaretBounds() const;
113 110
114 DECLARE_TRACE(); 111 DECLARE_TRACE();
115 112
116 #ifndef NDEBUG 113 #ifndef NDEBUG
117 void debugPosition(const char* msg = "") const; 114 void debugPosition(const char* msg = "") const;
118 void formatForDebugger(char* buffer, unsigned length) const; 115 void formatForDebugger(char* buffer, unsigned length) const;
119 void showTreeForThis() const; 116 void showTreeForThis() const;
120 #endif 117 #endif
121 118
122 private: 119 private:
123 template<typename Strategy> 120 template<typename Strategy>
124 void init(const PositionAlgorithm<Strategy>&, TextAffinity); 121 void init(const PositionAlgorithm<Strategy>&, TextAffinity);
125 122
126 Position leftVisuallyDistinctCandidate() const;
127 Position rightVisuallyDistinctCandidate() const;
128
129 Position m_deepPosition; 123 Position m_deepPosition;
130 TextAffinity m_affinity; 124 TextAffinity m_affinity;
131 }; 125 };
132 126
133 // Abs x/y position of the caret ignoring transforms. 127 // Abs x/y position of the caret ignoring transforms.
134 // TODO(yosin) navigation with transforms should be smarter. 128 // TODO(yosin) navigation with transforms should be smarter.
135 // TODO(yosin) We should move a glboal funciton 129 // TODO(yosin) We should move a glboal funciton
136 // |lineDirectionPointForBlockDirectionNavigationOf()| to "FrameSelection.h" 130 // |lineDirectionPointForBlockDirectionNavigationOf()| to "FrameSelection.h"
137 // as static function. 131 // as static function.
138 int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition&); 132 int lineDirectionPointForBlockDirectionNavigationOf(const VisiblePosition&);
139 133
140 EphemeralRange makeRange(const VisiblePosition&, const VisiblePosition&); 134 EphemeralRange makeRange(const VisiblePosition&, const VisiblePosition&);
141 135
136 // TODO(yosin) We should move |leftPositionOf()| and |rightPositionOf()| to
137 // "VisibleUnits.cpp".
138 VisiblePosition leftPositionOf(const VisiblePosition&);
139 VisiblePosition rightPositionOf(const VisiblePosition&);
140
142 CORE_EXPORT Position canonicalPositionOf(const Position&); 141 CORE_EXPORT Position canonicalPositionOf(const Position&);
143 CORE_EXPORT PositionInComposedTree canonicalPositionOf(const PositionInComposedT ree&); 142 CORE_EXPORT PositionInComposedTree canonicalPositionOf(const PositionInComposedT ree&);
144 // TODO(yosin) We should move |characterAfter()| and |characterBefore()| to 143 // TODO(yosin) We should move |characterAfter()| and |characterBefore()| to
145 // "VisibleUnits.cpp" 144 // "VisibleUnits.cpp"
146 UChar32 characterAfter(const VisiblePosition&); 145 UChar32 characterAfter(const VisiblePosition&);
147 UChar32 characterBefore(const VisiblePosition&); 146 UChar32 characterBefore(const VisiblePosition&);
148 PositionWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionWithAffinity &, const Position& anchor); 147 PositionWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionWithAffinity &, const Position& anchor);
149 PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const Positi onInComposedTreeWithAffinity&, const PositionInComposedTree& anchor); 148 PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const Positi onInComposedTreeWithAffinity&, const PositionInComposedTree& anchor);
150 149
151 // TODO(yosin) We should move |nextPositionOf()| to "VisibleUnits.cpp". 150 // TODO(yosin) We should move |nextPositionOf()| to "VisibleUnits.cpp".
152 VisiblePosition nextPositionOf(const VisiblePosition&, EditingBoundaryCrossingRu le = CanCrossEditingBoundary); 151 VisiblePosition nextPositionOf(const VisiblePosition&, EditingBoundaryCrossingRu le = CanCrossEditingBoundary);
153 // TODO(yosin) We should move |previousPositionOf()| to "VisibleUnits.cpp" 152 // TODO(yosin) We should move |previousPositionOf()| to "VisibleUnits.cpp"
154 VisiblePosition previousPositionOf(const VisiblePosition&, EditingBoundaryCrossi ngRule = CanCrossEditingBoundary); 153 VisiblePosition previousPositionOf(const VisiblePosition&, EditingBoundaryCrossi ngRule = CanCrossEditingBoundary);
155 154
156 } // namespace blink 155 } // namespace blink
157 156
158 #ifndef NDEBUG 157 #ifndef NDEBUG
159 // Outside the WebCore namespace for ease of invocation from gdb. 158 // Outside the WebCore namespace for ease of invocation from gdb.
160 void showTree(const blink::VisiblePosition*); 159 void showTree(const blink::VisiblePosition*);
161 void showTree(const blink::VisiblePosition&); 160 void showTree(const blink::VisiblePosition&);
162 #endif 161 #endif
163 162
164 #endif // VisiblePosition_h 163 #endif // VisiblePosition_h
OLDNEW
« no previous file with comments | « Source/core/editing/FrameSelection.cpp ('k') | Source/core/editing/VisiblePosition.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698