third_party/WebKit/Source/platform/fonts/FontDescription.h - Issue 1887613002: Compare font-feature-settings as part of Font::operator==().

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

Issue 1887613002: Compare font-feature-settings as part of Font::operator==(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/invalidation/font-feature-settings-expected.txt ('k') | third_party/WebKit/Source/platform/fonts/FontFeatureSettings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontDescription.h

diff --git a/third_party/WebKit/Source/platform/fonts/FontDescription.h b/third_party/WebKit/Source/platform/fonts/FontDescription.h

index a382603cb76c036e428ac7b17a9d8cb10317096d..88faa3a9155c798b8b5698c7759f4197bf15c10e 100644

--- a/third_party/WebKit/Source/platform/fonts/FontDescription.h

+++ b/third_party/WebKit/Source/platform/fonts/FontDescription.h

@@ -308,7 +308,7 @@ inline bool FontDescription::operator==(const FontDescription& other) const

&& m_wordSpacing == other.m_wordSpacing

&& m_fieldsAsUnsigned[0] == other.m_fieldsAsUnsigned[0]

&& m_fieldsAsUnsigned[1] == other.m_fieldsAsUnsigned[1]

- && m_featureSettings == other.m_featureSettings;

+ && (m_featureSettings == other.m_featureSettings || (m_featureSettings && other.m_featureSettings && *m_featureSettings == *other.m_featureSettings));

}

} // namespace blink