| Index: content/common/font_config_ipc_linux.h
|
| diff --git a/content/common/font_config_ipc_linux.h b/content/common/font_config_ipc_linux.h
|
| index 5e969cd2f126ed774a2c67aaaaae2d95a2d91bb4..59a4b0f4338f7c655ca0cda20a328b6fa1dc9ffb 100644
|
| --- a/content/common/font_config_ipc_linux.h
|
| +++ b/content/common/font_config_ipc_linux.h
|
| @@ -34,10 +34,10 @@ class FontConfigIPC : public SkFontConfigInterface {
|
| ~FontConfigIPC() override;
|
|
|
| bool matchFamilyName(const char familyName[],
|
| - SkTypeface::Style requested,
|
| + SkFontStyle requested,
|
| FontIdentity* outFontIdentifier,
|
| SkString* outFamilyName,
|
| - SkTypeface::Style* outStyle) override;
|
| + SkFontStyle* outStyle) override;
|
|
|
| // Returns a new SkTypeface instance or a ref'ed one from the cache. The
|
| // caller should adopt the pointer.
|
|
|