third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h - 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/CSSSegmentedFontFace.h

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/CSSSegmentedFontFace.h

diff --git a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h

index fe6293332b63c4d4410141a482de95954fd16b24..5d0ae5cce2b859ee68476472e53af0e23a214ab2 100644

--- a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h

+++ b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h

@@ -26,6 +26,7 @@

#ifndef CSSSegmentedFontFace_h

#define CSSSegmentedFontFace_h

+#include "platform/fonts/FontCacheKey.h"

#include "platform/fonts/FontTraits.h"

#include "platform/fonts/SegmentedFontData.h"

#include "platform/heap/Handle.h"

@@ -82,7 +83,7 @@ private:

Member<CSSFontSelector> m_fontSelector;

FontTraits m_traits;

- HashMap<unsigned, RefPtr<SegmentedFontData>> m_fontDataTable;

+ HashMap<FontCacheKey, RefPtr<SegmentedFontData>, FontCacheKeyHash, FontCacheKeyTraits> m_fontDataTable;

// All non-CSS-connected FontFaces are stored after the CSS-connected ones.

FontFaceList m_fontFaces;

FontFaceList::iterator m_firstNonCssConnectedFace;