Move legacyCreateTypeface to SkFontStyle.

content/common/font_config_ipc_linux.cc

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));

[dcheng, 2016/04/11 19:51:06]

How does this work? Isn't SkFontStyle a class?
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/skia/i...

[bungeman-chromium, 2016/04/11 20:32:17]

It is a class, but is explicitly convertible to a uint32_t (since that's
essentially what it is). If it's preferable, we could write
skia::WriteSkFontStyle and skia::ReadSkFontStyle in skia_utils_base, but it
seemed like a lot of work for what was essentially just an uint32_t. However, it
wouldn't be too much work to do if you think it would be better to write it out
per-component and then read it back in per-component.

[dcheng, 2016/04/11 21:06:50]

Right, I see that it just wraps a union that's uint32_t sized. But I don't see
operator uint32_t() defined on SkFontStyle, so I'm wondering how the compiler
ends up performing this conversion.

In any case, I'd prefer to see this written with something more explicit like
base::TimeTicks::ToInternalValue() and base::TimeTicks::FromInternalValue(). We
could just call it ToUint32() and FromUint32() for SkFontStyle.

[bungeman-chromium, 2016/04/11 22:31:10]

The Skia change linked in the description is being pulled in via DEPS.
Done.

 
   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;
 }