Do not break after ZWJ if the trailing character is Emoji.

third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp

Index: third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp
diff --git a/third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp b/third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp
index 3ea60fba74d0f4a27eb9c89fc44c8524d9cab957..0f0a2625476b2b1f40424b897324584b82794ee6 100644
--- a/third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp
+++ b/third_party/WebKit/Source/core/editing/state_machines/BackspaceStateMachine.cpp
@@ -11,23 +11,6 @@
 
 namespace blink {
 
-namespace {
-
-// Returns true if the code point can be a part of ZWJ sequence.
-bool isZwjEmoji(uint32_t codePoint)
-{
-    return codePoint == WTF::Unicode::boyCharacter
-        || codePoint == WTF::Unicode::eyeCharacter
-        || codePoint == WTF::Unicode::girlCharacter
-        || codePoint == WTF::Unicode::heavyBlackHeartCharacter
-        || codePoint == WTF::Unicode::kissMarkCharacter
-        || codePoint == WTF::Unicode::leftSpeechBubbleCharacter
-        || codePoint == WTF::Unicode::manCharacter
-        || codePoint == WTF::Unicode::womanCharacter;
-}
-
-} // namespace
-
 #define FOR_EACH_BACKSPACE_STATE_MACHINE_STATE(V)                          \
     /* Initial state */                                                    \
     V(Start)                                                               \
@@ -118,12 +101,12 @@ BackspaceStateMachine::feedPrecedingCodeUnit(UChar codeUnit)
             return moveToNextState(BackspaceState::BeforeLF);
         if (u_hasBinaryProperty(codePoint, UCHAR_VARIATION_SELECTOR))
             return moveToNextState(BackspaceState::BeforeVS);
-        if (isZwjEmoji(codePoint))
-            return moveToNextState(BackspaceState::BeforeZWJEmoji);
         if (Character::isRegionalIndicator(codePoint))
             return moveToNextState(BackspaceState::OddNumberedRIS);
         if (Character::isModifier(codePoint))
             return moveToNextState(BackspaceState::BeforeEmojiModifier);
+        if (Character::isEmoji(codePoint))
+            return moveToNextState(BackspaceState::BeforeZWJEmoji);
         if (codePoint == combiningEnclosingKeycapCharacter)
             return moveToNextState(BackspaceState::BeforeKeycap);
         return finish();
@@ -166,7 +149,7 @@ BackspaceStateMachine::feedPrecedingCodeUnit(UChar codeUnit)
         }
         return finish();
     case BackspaceState::BeforeVS:
-        if (isZwjEmoji(codePoint)) {
+        if (Character::isEmoji(codePoint)) {
             m_codeUnitsToBeDeleted += U16_LENGTH(codePoint);
             return moveToNextState(BackspaceState::BeforeZWJEmoji);
         }
@@ -178,7 +161,7 @@ BackspaceStateMachine::feedPrecedingCodeUnit(UChar codeUnit)
         return codePoint == zeroWidthJoinerCharacter ?
             moveToNextState(BackspaceState::BeforeZWJ) : finish();
     case BackspaceState::BeforeZWJ:
-        if (isZwjEmoji(codePoint)) {
+        if (Character::isEmoji(codePoint)) {
             m_codeUnitsToBeDeleted += U16_LENGTH(codePoint) + 1; // +1 for ZWJ
             return moveToNextState(BackspaceState::BeforeZWJEmoji);
         }
@@ -189,7 +172,7 @@ BackspaceStateMachine::feedPrecedingCodeUnit(UChar codeUnit)
         }
         return finish();
     case BackspaceState::BeforeVSAndZWJ:
-        if (!isZwjEmoji(codePoint))
+        if (!Character::isEmoji(codePoint))
             return finish();
 
         DCHECK_GT(m_lastSeenVSCodeUnits, 0);