| 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..b6ba92d543fd9c61227e3ca823746eb0923ae1ac 100644
|
| --- a/content/browser/renderer_host/sandbox_ipc_linux.cc
|
| +++ b/content/browser/renderer_host/sandbox_ipc_linux.cc
|
| @@ -173,19 +173,20 @@ void SandboxIPCHandler::HandleFontMatchRequest(
|
| int fd,
|
| base::PickleIterator iter,
|
| const std::vector<base::ScopedFD>& fds) {
|
| - uint32_t requested_style;
|
| + SkFontStyle requested_style;
|
| std::string family;
|
| - if (!iter.ReadString(&family) || !iter.ReadUInt32(&requested_style))
|
| + if (!iter.ReadString(&family) ||
|
| + !skia::ReadSkFontStyle(&iter, &requested_style))
|
| return;
|
|
|
| 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),
|
| + requested_style,
|
| &result_identity,
|
| &result_family,
|
| &result_style);
|
| @@ -202,7 +203,7 @@ void SandboxIPCHandler::HandleFontMatchRequest(
|
| reply.WriteBool(true);
|
| skia::WriteSkString(&reply, result_family);
|
| skia::WriteSkFontIdentity(&reply, result_identity);
|
| - reply.WriteUInt32(result_style);
|
| + skia::WriteSkFontStyle(&reply, result_style);
|
| }
|
| SendRendererReply(fds, reply, -1);
|
| }
|
|
|