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

Unified Diff: Source/core/editing/EditingUtilities.cpp

Issue 1328493002: Move static member function normalizeRange() out from VisibleSelection (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-01T16:34:49 Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/editing/EditingUtilities.h ('k') | Source/core/editing/Editor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/EditingUtilities.cpp
diff --git a/Source/core/editing/EditingUtilities.cpp b/Source/core/editing/EditingUtilities.cpp
index 27862b213176f829ec9db4166ec2a05385fa0752..eac4b20d1436a1b5e94fb749434cce3048bed315 100644
--- a/Source/core/editing/EditingUtilities.cpp
+++ b/Source/core/editing/EditingUtilities.cpp
@@ -1531,6 +1531,33 @@ EphemeralRange makeRange(const VisiblePosition &start, const VisiblePosition &en
return EphemeralRange(s, e);
}
+template <typename Strategy>
+static EphemeralRangeTemplate<Strategy> normalizeRangeAlgorithm(const EphemeralRangeTemplate<Strategy>& range)
+{
+ ASSERT(range.isNotNull());
+ range.document().updateLayoutIgnorePendingStylesheets();
+
+ // TODO(yosin) We should not call |parentAnchoredEquivalent()|, it is
+ // redundant.
+ const PositionAlgorithm<Strategy> normalizedStart = mostForwardCaretPosition(range.startPosition()).parentAnchoredEquivalent();
+ const PositionAlgorithm<Strategy> normalizedEnd = mostBackwardCaretPosition(range.endPosition()).parentAnchoredEquivalent();
+ // The order of the positions of |start| and |end| can be swapped after
+ // upstream/downstream. e.g. editing/pasteboard/copy-display-none.html
+ if (normalizedStart.compareTo(normalizedEnd) > 0)
+ return EphemeralRangeTemplate<Strategy>(normalizedEnd, normalizedStart);
+ return EphemeralRangeTemplate<Strategy>(normalizedStart, normalizedEnd);
+}
+
+EphemeralRange normalizeRange(const EphemeralRange& range)
+{
+ return normalizeRangeAlgorithm<EditingStrategy>(range);
+}
+
+EphemeralRangeInComposedTree normalizeRange(const EphemeralRangeInComposedTree& range)
+{
+ return normalizeRangeAlgorithm<EditingInComposedTreeStrategy>(range);
+}
+
VisiblePosition visiblePositionForIndex(int index, ContainerNode* scope)
{
if (!scope)
« no previous file with comments | « Source/core/editing/EditingUtilities.h ('k') | Source/core/editing/Editor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698