Index: third_party/WebKit/Source/platform/text/Character.h |
diff --git a/third_party/WebKit/Source/platform/text/Character.h b/third_party/WebKit/Source/platform/text/Character.h |
index 8d3c4159b15027e2aac471c75acc0de070c0f1dd..1bef1a6713bfa6b0ebe72430d5ece69e1dd9587b 100644 |
--- a/third_party/WebKit/Source/platform/text/Character.h |
+++ b/third_party/WebKit/Source/platform/text/Character.h |
@@ -96,10 +96,16 @@ public: |
|| c == zeroWidthNonJoinerCharacter |
|| c == zeroWidthJoinerCharacter; |
} |
- static bool treatAsZeroWidthSpaceInComplexScript(UChar32 c) |
+ static bool legacyTreatAsZeroWidthSpaceInComplexScript(UChar32 c) |
{ |
return c < 0x20 // ASCII Control Characters |
|| (c >= 0x7F && c < 0xA0) // ASCII Delete .. No-break spaceCharacter |
+ || treatAsZeroWidthSpaceInComplexScript(c); |
+ } |
+ static bool treatAsZeroWidthSpaceInComplexScript(UChar32 c) |
+ { |
+ return c == formFeedCharacter |
+ || c == carriageReturnCharacter |
|| c == softHyphenCharacter |
|| c == zeroWidthSpaceCharacter |
|| (c >= leftToRightMarkCharacter && c <= rightToLeftMarkCharacter) |