Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp

Issue 2706033009: Limit optimized LayoutBlockFlowLine width computation to 8bit (Closed)
Patch Set: w/Baselines Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698