Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: components/font_service/public/cpp/font_service_thread.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:
View side-by-side diff with in-line comments
Download patch
Index: components/font_service/public/cpp/font_service_thread.h
diff --git a/components/font_service/public/cpp/font_service_thread.h b/components/font_service/public/cpp/font_service_thread.h
index 2ec4dbd6bc3f590ed557a3f0e907a52fd454a906..04c75a2a465c958aab04556ad808ea9487ec804e 100644
--- a/components/font_service/public/cpp/font_service_thread.h
+++ b/components/font_service/public/cpp/font_service_thread.h
@@ -35,10 +35,10 @@ class FontServiceThread : public base::Thread,
// These methods are proxies which run on your thread, post a blocking task
// to the FontServiceThread, and wait on an event signaled from the callback.
bool MatchFamilyName(const char family_name[],
- SkTypeface::Style requested_style,
+ SkFontStyle requested_style,
SkFontConfigInterface::FontIdentity* out_font_identity,
SkString* out_family_name,
- SkTypeface::Style* out_style);
+ SkFontStyle* out_style);
scoped_refptr<MappedFontFile> OpenStream(
const SkFontConfigInterface::FontIdentity& identity);
@@ -52,11 +52,11 @@ class FontServiceThread : public base::Thread,
void MatchFamilyNameImpl(
base::WaitableEvent* done_event,
const char family_name[],
- SkTypeface::Style requested_style,
+ SkFontStyle requested_style,
bool* out_valid,
SkFontConfigInterface::FontIdentity* out_font_identity,
SkString* out_family_name,
- SkTypeface::Style* out_style);
+ SkFontStyle* out_style);
// Called on the FontServiceThread in response to receiving a message from
// our MatchFamily mojo IPC. This writes the data returned by mojo, and then
@@ -66,10 +66,10 @@ class FontServiceThread : public base::Thread,
bool* out_valid,
SkFontConfigInterface::FontIdentity* out_font_identity,
SkString* out_family_name,
- SkTypeface::Style* out_style,
+ SkFontStyle* out_style,
FontIdentityPtr font_identity,
mojo::String family_name,
- TypefaceStyle style);
+ TypefaceStylePtr style);
// Implementation of OpenStream; same threading restrictions as MatchFamily.
void OpenStreamImpl(base::WaitableEvent* done_event,
« no previous file with comments | « components/font_service/public/cpp/font_loader.cc ('k') | components/font_service/public/cpp/font_service_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698