third_party/WebKit/Source/platform/fonts/Font.cpp - Issue 2020863002: Guard against invalid glyph shaping results

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2020863002: Guard against invalid glyph shaping results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address reviewer comments Created 4 years, 7 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:

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 c268653f2c66b24c22610714271bdc0a76dd3aa1..4406868fcb70ccc8d448d2e808431ff4cb110ca9 100644

--- a/third_party/WebKit/Source/platform/fonts/Font.cpp

+++ b/third_party/WebKit/Source/platform/fonts/Font.cpp

@@ -767,7 +767,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