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

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

Issue 1833653002: Move LayoutObject::nextOffset/previousOffset() to editing utility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added test cases. Created 4 years, 9 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
Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
index fed03353f55ed4fa03b8f0b67ffc02d2b62934ef..a5748f859505025388e33c7a977601d7afb6f13f 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -542,9 +542,18 @@ PositionInFlatTree lastEditablePositionBeforePositionInRoot(const PositionInFlat
return lastEditablePositionBeforePositionInRootAlgorithm<EditingInFlatTreeStrategy>(position, highestRoot);
}
-int uncheckedPreviousOffset(const Node* n, int current)
+int uncheckedPreviousOffset(const Node* node, int current)
{
- return n->layoutObject() ? n->layoutObject()->previousOffset(current) : current - 1;
+ if (!node->isTextNode())
+ return current - 1;
+ const String& text = toText(node)->data();
+ if (text.is8Bit())
+ return current - 1; // TODO(nona): Good to support CR x LF.
+ TextBreakIterator* iterator = cursorMovementIterator(text.characters16(), text.length());
+ if (!iterator)
+ return current - 1;
+ const int result = iterator->preceding(current);
+ return result == TextBreakDone ? current - 1 : result;
}
static int uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current)
@@ -552,9 +561,18 @@ static int uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current
return n->layoutObject() ? n->layoutObject()->previousOffsetForBackwardDeletion(current) : current - 1;
}
-int uncheckedNextOffset(const Node* n, int current)
+int uncheckedNextOffset(const Node* node, int current)
{
- return n->layoutObject() ? n->layoutObject()->nextOffset(current) : current + 1;
+ if (!node->isTextNode())
+ return current + 1;
+ const String& text = toText(node)->data();
+ if (text.is8Bit())
+ return current + 1; // TODO(nona): Good to support CR x LF.
+ TextBreakIterator* iterator = cursorMovementIterator(text.characters16(), text.length());
+ if (!iterator)
+ return current + 1;
+ const int result = iterator->following(current);
+ return result == TextBreakDone ? current + 1 : result;
}
template <typename Strategy>

Powered by Google App Engine
This is Rietveld 408576698