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

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

Issue 1839613002: Move LayoutObject::previousOffsetForBackwardDeletion() to editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: replace CHECK with DCHECK 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a5748f859505025388e33c7a977601d7afb6f13f..3fe2471ade436bcc32bb056d46e8063e953f0e89 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -55,6 +55,7 @@
#include "wtf/Assertions.h"
#include "wtf/StdLibExtras.h"
#include "wtf/text/StringBuilder.h"
+#include "wtf/text/Unicode.h"
namespace blink {
@@ -556,9 +557,21 @@ int uncheckedPreviousOffset(const Node* node, int current)
return result == TextBreakDone ? current - 1 : result;
}
-static int uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current)
+static int uncheckedPreviousOffsetForBackwardDeletion(const Node* node, int current)
{
- return n->layoutObject() ? n->layoutObject()->previousOffsetForBackwardDeletion(current) : current - 1;
+ DCHECK_GE(current, 0);
+ if (current <= 1)
+ return 0;
+ if (!node->isTextNode())
+ return current - 1;
+
+ const String& text = toText(node)->data();
+ DCHECK(static_cast<unsigned>(current - 1) < text.length());
+ if (U16_IS_TRAIL(text[--current]))
+ --current;
+ if (current < 0)
+ current = 0;
+ return current;
}
int uncheckedNextOffset(const Node* node, int current)
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/EditingUtilitiesTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698