Source/core/css/CSSFontSelector.cpp - Issue 1270723002: Improve CSS Style matching spec compliance

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: Source/core/css/CSSFontSelector.cpp

Issue 1270723002: Improve CSS Style matching spec compliance (Closed) Base URL: git@github.com:drott/blink-crosswalk.git@reimplementMatching

Patch Set: TODOs with bugs, redundant file removed, test expectations fix Created 5 years, 4 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: Source/core/css/CSSFontSelector.cpp

diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp

index d984785f0638362ca88bdce4deb68553a3cea4a3..0881d63f83f35c65a7422a78863a59cfdd4ac9fd 100644

--- a/Source/core/css/CSSFontSelector.cpp

+++ b/Source/core/css/CSSFontSelector.cpp

@@ -130,8 +130,9 @@ static AtomicString familyNameFromSettings(const GenericFontFamilySettings& sett

PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)

{

- if (CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, familyName))

+ if (CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, familyName)) {

Kunihiko Sakamoto 2015/08/05 10:36:36 Unnecessary braces.

return face->getFontData(fontDescription);

+ }

// Try to return the correct font based off our settings, in case we were handed the generic font family name.

AtomicString settingsFamilyName = familyNameFromSettings(m_genericFontFamilySettings, fontDescription, familyName);