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

Unified Diff: third_party/WebKit/Source/platform/fonts/Font.cpp

Issue 2063813003: Guard against invalid glyph shaping results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 6 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
Index: third_party/WebKit/Source/platform/fonts/Font.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/Font.cpp b/third_party/WebKit/Source/platform/fonts/Font.cpp
index 64110d549da68f8650790cc9039ae0fdfda5e532..13210514494396aff73cea01e525111fc406d0f4 100644
--- a/third_party/WebKit/Source/platform/fonts/Font.cpp
+++ b/third_party/WebKit/Source/platform/fonts/Font.cpp
@@ -760,7 +760,9 @@ Vector<CharacterRange> Font::individualCharacterRanges(const TextRun& run) const
// will be improved shaping in SVG when compared to HTML.
FontCachePurgePreventer purgePreventer;
CachingWordShaper shaper(m_fontFallbackList->shapeCache(m_fontDescription));
- return shaper.individualCharacterRanges(this, run);
+ auto ranges = shaper.individualCharacterRanges(this, run);
+ DCHECK_EQ(ranges.size(), static_cast<unsigned>(run.length()));
+ return ranges;
}
float Font::floatWidthForSimpleText(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const

Powered by Google App Engine
This is Rietveld 408576698