Index: Source/platform/fonts/Character.cpp |
diff --git a/Source/platform/fonts/Character.cpp b/Source/platform/fonts/Character.cpp |
index 9ae36fc83ca78d1ffee41b510d576eb556914cdd..8a1308f8fd88bf2353298a13bb72be9df3380d74 100644 |
--- a/Source/platform/fonts/Character.cpp |
+++ b/Source/platform/fonts/Character.cpp |
@@ -378,6 +378,13 @@ unsigned Character::expansionOpportunityCount(const UChar* characters, size_t le |
character = U16_GET_SUPPLEMENTARY(character, characters[i + 1]); |
i++; |
} |
+ if (textJustify == TextJustify::TextJustifyAuto && isCJKIdeographOrSymbol(character)) { |
+ if (!isAfterExpansion) |
+ count++; |
+ count++; |
+ isAfterExpansion = true; |
+ continue; |
+ } |
isAfterExpansion = false; |
} |
} else { |
@@ -392,6 +399,13 @@ unsigned Character::expansionOpportunityCount(const UChar* characters, size_t le |
character = U16_GET_SUPPLEMENTARY(characters[i - 2], character); |
i--; |
} |
+ if (textJustify == TextJustify::TextJustifyAuto && isCJKIdeographOrSymbol(character)) { |
+ if (!isAfterExpansion) |
+ count++; |
+ count++; |
+ isAfterExpansion = true; |
+ continue; |
+ } |
isAfterExpansion = false; |
} |
} |