third_party/WebKit/Source/platform/fonts/FontDescription.cpp - Issue 1911863002: Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the

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.cpp

Issue 1911863002: Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallbackproxy

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/Source/platform/fonts/FontDescription.h ('k') | third_party/WebKit/Source/platform/fonts/FontTraits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index cde54996f91e78b47033a4320ff8b9765813cfd4..ee19f799bb01ac5ca8cd3efab671b28427bb84d3 100644

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

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

@@ -278,22 +278,4 @@

return hash;

}

-SkFontStyle FontDescription::skiaFontStyle() const

- int width = static_cast<int>(stretch());

- SkFontStyle::Slant slant = style() == FontStyleItalic

- ? SkFontStyle::kItalic_Slant

- : SkFontStyle::kUpright_Slant;

- return SkFontStyle(numericFontWeight(weight()), width, slant);

- static_assert(

- static_cast<int>(FontStretchUltraCondensed) == static_cast<int>(SkFontStyle::kUltraCondensed_Width),

- "FontStretchUltraCondensed should map to kUltraCondensed_Width");

- static_assert(

- static_cast<int>(FontStretchNormal) == static_cast<int>(SkFontStyle::kNormal_Width),

- "FontStretchNormal should map to kNormal_Width");

- static_assert(

- static_cast<int>(FontStretchUltraExpanded) == static_cast<int>(SkFontStyle::kUltaExpanded_Width),

- "FontStretchUltraExpanded should map to kUltaExpanded_Width");

} // namespace blink