third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp - Issue 1973153004: Fix FontCacheKey-keyed HashMap usage in core/css

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/core/css/CSSFontFaceSource.cpp

Issue 1973153004: Fix FontCacheKey-keyed HashMap usage in core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: +comment 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/core/css/CSSFontFaceSource.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp

index b72eb5e9927253f5c2fd9ff22a4b0e0c08fcce9f..146df6132ab256c21042d278af5be04c3415df73 100644

--- a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp

+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp

@@ -57,7 +57,7 @@ PassRefPtr<SimpleFontData> CSSFontFaceSource::getFontData(const FontDescription&

// TODO(drott): Check whether losing traits information here is problematic. crbug.com/516677

FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams());

- RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr).storedValue->value;

+ RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(key, nullptr).storedValue->value;

if (!fontData)

fontData = createFontData(fontDescription);

return fontData; // No release, because fontData is a reference to a RefPtr that is held in the m_fontDataTable.