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

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

Issue 1307023005: Move {next,previous}PositionOf() for VisiblePosition to VisibleUnits.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-31T22:28:28 Rebase 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/PlainTextRange.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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef VisiblePosition_h 26 #ifndef VisiblePosition_h
27 #define VisiblePosition_h 27 #define VisiblePosition_h
28 28
29 #include "core/CoreExport.h" 29 #include "core/CoreExport.h"
30 #include "core/editing/EditingBoundary.h"
31 #include "core/editing/PositionWithAffinity.h" 30 #include "core/editing/PositionWithAffinity.h"
32 #include "core/editing/TextAffinity.h" 31 #include "core/editing/TextAffinity.h"
33 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
34 #include "platform/text/TextDirection.h"
35 33
36 namespace blink { 34 namespace blink {
37 35
38 // VisiblePosition default affinity is downstream because 36 // VisiblePosition default affinity is downstream because
39 // the callers do not really care (they just want the 37 // the callers do not really care (they just want the
40 // deep position without regard to line position), and this 38 // deep position without regard to line position), and this
41 // is cheaper than UPSTREAM 39 // is cheaper than UPSTREAM
42 #define VP_DEFAULT_AFFINITY TextAffinity::Downstream 40 #define VP_DEFAULT_AFFINITY TextAffinity::Downstream
43 41
44 // Callers who do not know where on the line the position is, 42 // Callers who do not know where on the line the position is,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 UChar32 characterBefore(const VisiblePosition&); 138 UChar32 characterBefore(const VisiblePosition&);
141 139
142 // TODO(yosin) We should move |honorEditingBoundaryAtOr{Before,After} to 140 // TODO(yosin) We should move |honorEditingBoundaryAtOr{Before,After} to
143 // "VisibleUnits.cpp" as static function. 141 // "VisibleUnits.cpp" as static function.
144 // next() and previous() will increment/decrement by a character cluster. 142 // next() and previous() will increment/decrement by a character cluster.
145 VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition&, const Pos ition& anchor); 143 VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition&, const Pos ition& anchor);
146 PositionWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionWithAffinity &, const Position& anchor); 144 PositionWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionWithAffinity &, const Position& anchor);
147 PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const Positi onInComposedTreeWithAffinity&, const PositionInComposedTree& anchor); 145 PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const Positi onInComposedTreeWithAffinity&, const PositionInComposedTree& anchor);
148 VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition&, const Posi tion& anchor); 146 VisiblePosition honorEditingBoundaryAtOrAfter(const VisiblePosition&, const Posi tion& anchor);
149 147
150 // TODO(yosin) We should move |nextPositionOf()| to "VisibleUnits.cpp".
151 VisiblePosition nextPositionOf(const VisiblePosition&, EditingBoundaryCrossingRu le = CanCrossEditingBoundary);
152 // TODO(yosin) We should move |previousPositionOf()| to "VisibleUnits.cpp"
153 VisiblePosition previousPositionOf(const VisiblePosition&, EditingBoundaryCrossi ngRule = CanCrossEditingBoundary);
154
155 CORE_EXPORT VisiblePosition visiblePositionOf(const Position&, TextAffinity = VP _DEFAULT_AFFINITY); 148 CORE_EXPORT VisiblePosition visiblePositionOf(const Position&, TextAffinity = VP _DEFAULT_AFFINITY);
156 CORE_EXPORT VisiblePosition visiblePositionOf(const PositionInComposedTree&, Tex tAffinity = VP_DEFAULT_AFFINITY); 149 CORE_EXPORT VisiblePosition visiblePositionOf(const PositionInComposedTree&, Tex tAffinity = VP_DEFAULT_AFFINITY);
157 150
158 } // namespace blink 151 } // namespace blink
159 152
160 #ifndef NDEBUG 153 #ifndef NDEBUG
161 // Outside the WebCore namespace for ease of invocation from gdb. 154 // Outside the WebCore namespace for ease of invocation from gdb.
162 void showTree(const blink::VisiblePosition*); 155 void showTree(const blink::VisiblePosition*);
163 void showTree(const blink::VisiblePosition&); 156 void showTree(const blink::VisiblePosition&);
164 #endif 157 #endif
165 158
166 #endif // VisiblePosition_h 159 #endif // VisiblePosition_h
OLDNEW
« no previous file with comments | « Source/core/editing/PlainTextRange.cpp ('k') | Source/core/editing/VisiblePosition.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698