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

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

Issue 1824143003: [All-In-One] Introduce BackspaceStateMachine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 a5748f859505025388e33c7a977601d7afb6f13f..8dc5caad2478089dc78a23645216774a8ab0bf10 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -32,6 +32,7 @@
#include "core/dom/Range.h"
#include "core/dom/Text.h"
#include "core/dom/shadow/ShadowRoot.h"
+#include "core/editing/BackspaceStateMachine.h"
#include "core/editing/EditingStrategy.h"
#include "core/editing/Editor.h"
#include "core/editing/PlainTextRange.h"
@@ -556,9 +557,25 @@ 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();
+ CHECK(static_cast<unsigned>(current - 1) < text.length());
+ BackspaceStateMachine machine;
+ for (int i = current - 1; i >= 0; --i) {
+ if (machine.updateState(text[i]))
+ break;
+ }
+ const int amount = machine.finalizeAndGetCodeUnitCountToBeDeleted();
+ DCHECK_GE(amount, 1);
+ DCHECK_GE(current, amount);
+ return current - amount;
}
int uncheckedNextOffset(const Node* node, int current)

Powered by Google App Engine
This is Rietveld 408576698