components/font_service/public/cpp/font_loader.h - Issue 1877673002: Move legacyCreateTypeface to SkFontStyle.

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: components/font_service/public/cpp/font_loader.h

Issue 1877673002: Move legacyCreateTypeface to SkFontStyle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove DEPS change now that Skia change has landed. 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:

Index: components/font_service/public/cpp/font_loader.h

diff --git a/components/font_service/public/cpp/font_loader.h b/components/font_service/public/cpp/font_loader.h

index 557241fae18cdbae0cf964040e368959c701bd33..ba79e0968f5972e8ccc4373d3f29ad5f76d79a0b 100644

--- a/components/font_service/public/cpp/font_loader.h

+++ b/components/font_service/public/cpp/font_loader.h

@@ -43,10 +43,10 @@ class FontLoader : public SkFontConfigInterface,

// SkFontConfigInterface:

bool matchFamilyName(const char family_name[],

- SkTypeface::Style requested,

+ SkFontStyle requested,

FontIdentity* out_font_identifier,

SkString* out_family_name,

- SkTypeface::Style* out_style) override;

+ SkFontStyle* out_style) override;

SkStreamAsset* openStream(const FontIdentity& identity) override;

private: