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

Unified Diff: content/common/font_config_ipc_linux.cc

Issue 1877673002: Move legacyCreateTypeface to SkFontStyle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, update Skia change. 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: content/common/font_config_ipc_linux.cc
diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc
index 08fed236fa59c561f92885d9cd065667ea26d264..f274cf4c462b155bdb52e19465bc63373f684a8a 100644
--- a/content/common/font_config_ipc_linux.cc
+++ b/content/common/font_config_ipc_linux.cc
@@ -64,10 +64,10 @@ FontConfigIPC::~FontConfigIPC() {
}
bool FontConfigIPC::matchFamilyName(const char familyName[],
- SkTypeface::Style requestedStyle,
+ SkFontStyle requestedStyle,
FontIdentity* outFontIdentity,
SkString* outFamilyName,
- SkTypeface::Style* outStyle) {
+ SkFontStyle* outStyle) {
TRACE_EVENT0("sandbox_ipc", "FontConfigIPC::matchFamilyName");
size_t familyNameLen = familyName ? strlen(familyName) : 0;
if (familyNameLen > kMaxFontFamilyLength)
@@ -76,7 +76,7 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
base::Pickle request;
request.WriteInt(METHOD_MATCH);
request.WriteData(familyName, familyNameLen);
- request.WriteUInt32(requestedStyle);
+ request.WriteUInt32(static_cast<uint32_t>(requestedStyle));
uint8_t reply_buf[2048];
const ssize_t r = base::UnixDomainSocket::SendRecvMsg(
@@ -106,7 +106,7 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
if (outFamilyName)
*outFamilyName = reply_family;
if (outStyle)
- *outStyle = static_cast<SkTypeface::Style>(reply_style);
+ *outStyle = static_cast<SkFontStyle>(reply_style);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698