| Index: Source/platform/fonts/Character.cpp
|
| diff --git a/Source/platform/fonts/Character.cpp b/Source/platform/fonts/Character.cpp
|
| index 9da5c8dfcc3978acfb59c759550aed91ee2e6b34..b8a49745ba0a4d112999e911c8f91b9aa221879b 100644
|
| --- a/Source/platform/fonts/Character.cpp
|
| +++ b/Source/platform/fonts/Character.cpp
|
| @@ -31,7 +31,6 @@
|
| #include "config.h"
|
| #include "platform/fonts/Character.h"
|
|
|
| -#include "platform/fonts/FontPlatformFeatures.h"
|
| #include "wtf/StdLibExtras.h"
|
| #include "wtf/text/StringBuilder.h"
|
|
|
| @@ -288,7 +287,6 @@ unsigned Character::expansionOpportunityCount(const LChar* characters, size_t le
|
|
|
| unsigned Character::expansionOpportunityCount(const UChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
|
| {
|
| - static bool expandAroundIdeographs = FontPlatformFeatures::canExpandAroundIdeographsInComplexText();
|
| unsigned count = 0;
|
| if (direction == LTR) {
|
| for (size_t i = 0; i < length; ++i) {
|
| @@ -302,13 +300,6 @@ unsigned Character::expansionOpportunityCount(const UChar* characters, size_t le
|
| character = U16_GET_SUPPLEMENTARY(character, characters[i + 1]);
|
| i++;
|
| }
|
| - if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
|
| - if (!isAfterExpansion)
|
| - count++;
|
| - count++;
|
| - isAfterExpansion = true;
|
| - continue;
|
| - }
|
| isAfterExpansion = false;
|
| }
|
| } else {
|
| @@ -323,13 +314,6 @@ unsigned Character::expansionOpportunityCount(const UChar* characters, size_t le
|
| character = U16_GET_SUPPLEMENTARY(characters[i - 2], character);
|
| i--;
|
| }
|
| - if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
|
| - if (!isAfterExpansion)
|
| - count++;
|
| - count++;
|
| - isAfterExpansion = true;
|
| - continue;
|
| - }
|
| isAfterExpansion = false;
|
| }
|
| }
|
|
|