| Index: Source/platform/fonts/Character.h
|
| diff --git a/Source/platform/fonts/Character.h b/Source/platform/fonts/Character.h
|
| index f887e8bca1e67f1a02645a0f99abdeb25aff2947..5e76735bb6cd5ddd5b0bc17369365c0aed06d98d 100644
|
| --- a/Source/platform/fonts/Character.h
|
| +++ b/Source/platform/fonts/Character.h
|
| @@ -34,6 +34,7 @@
|
| #include "platform/PlatformExport.h"
|
| #include "platform/text/TextDirection.h"
|
| #include "platform/text/TextPath.h"
|
| +#include "platform/text/TextRun.h"
|
| #include "wtf/HashSet.h"
|
| #include "wtf/text/WTFString.h"
|
| #include "wtf/unicode/CharacterNames.h"
|
| @@ -48,8 +49,8 @@ public:
|
| static bool isCJKIdeograph(UChar32);
|
| static bool isCJKIdeographOrSymbol(UChar32);
|
|
|
| - static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion);
|
| - static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion);
|
| + static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustifyStore);
|
| + static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustifyStore);
|
|
|
| static bool treatAsSpace(UChar c) { return c == ' ' || c == '\t' || c == '\n' || c == noBreakSpace; }
|
| static bool treatAsZeroWidthSpace(UChar c) { return treatAsZeroWidthSpaceInComplexScript(c) || c == 0x200c || c == 0x200d; }
|
|
|