Index: content/browser/renderer_host/sandbox_ipc_linux.cc |
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.cc b/content/browser/renderer_host/sandbox_ipc_linux.cc |
index 94a34b58d1bb868e6b5af7d48fd20b960d979df2..6843c117bc79b984b36284580182fd454ff778df 100644 |
--- a/content/browser/renderer_host/sandbox_ipc_linux.cc |
+++ b/content/browser/renderer_host/sandbox_ipc_linux.cc |
@@ -180,12 +180,12 @@ void SandboxIPCHandler::HandleFontMatchRequest( |
SkFontConfigInterface::FontIdentity result_identity; |
SkString result_family; |
- SkTypeface::Style result_style; |
+ SkFontStyle result_style; |
SkFontConfigInterface* fc = |
SkFontConfigInterface::GetSingletonDirectInterface(); |
const bool r = |
fc->matchFamilyName(family.c_str(), |
- static_cast<SkTypeface::Style>(requested_style), |
+ static_cast<SkFontStyle>(requested_style), |
&result_identity, |
&result_family, |
&result_style); |
@@ -202,7 +202,7 @@ void SandboxIPCHandler::HandleFontMatchRequest( |
reply.WriteBool(true); |
skia::WriteSkString(&reply, result_family); |
skia::WriteSkFontIdentity(&reply, result_identity); |
- reply.WriteUInt32(result_style); |
+ reply.WriteUInt32(static_cast<uint32_t>(result_style)); |
} |
SendRendererReply(fds, reply, -1); |
} |