Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
index 5d6d52cfc53bd06275401d01a23b334a116cad3c..73fd82b32e8817d7ad407c0a17655c87b43deee3 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -548,9 +548,11 @@ static inline void setLogicalWidthForTextRun( |
// FIXME: Having any font feature settings enabled can lead to selection gaps |
// on Chromium-mac. https://bugs.webkit.org/show_bug.cgi?id=113418 |
bool canUseCachedWordMeasurements = |
- font.canShapeWordByWord() && !font.getFontDescription().featureSettings(); |
+ font.canShapeWordByWord() && |
+ !font.getFontDescription().featureSettings() && layoutText.is8Bit(); |
#else |
- bool canUseCachedWordMeasurements = font.canShapeWordByWord(); |
+ bool canUseCachedWordMeasurements = |
+ font.canShapeWordByWord() && layoutText.is8Bit(); |
#endif |
if (canUseCachedWordMeasurements) { |