Linux: fix fake italics for font's without italic variants.

skia/ext/SkFontHost_fontconfig_ipc.cpp

 /* libs/graphics/ports/SkFontHost_fontconfig_direct.cpp
 **
 ** Copyright 2009, Google Inc.
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
 ** You may obtain a copy of the License at
 **
 **     http://www.apache.org/licenses/LICENSE-2.0
 **
@@ skipping 21 matching lines @@
     : fd_(fd) {
 }
 
 FontConfigIPC::~FontConfigIPC() {
     close(fd_);
 }
 
 bool FontConfigIPC::Match(std::string* result_family,
                           unsigned* result_fileid,
                           bool fileid_valid, unsigned fileid,
-                          const std::string& family, int is_bold,
-                          int is_italic) {
+                          const std::string& family, bool* is_bold,
+                          bool* is_italic) {
     Pickle request;
     request.WriteInt(METHOD_MATCH);
     request.WriteBool(fileid_valid);
     if (fileid_valid)
       request.WriteUInt32(fileid);
-    request.WriteBool(is_bold);
-    request.WriteBool(is_italic);
+
+    request.WriteBool(is_bold && *is_bold);
+    request.WriteBool(is_bold && *is_italic);
+
     request.WriteString(family);
 
     uint8_t reply_buf[512];
     const ssize_t r = base::SendRecvMsg(fd_, reply_buf, sizeof(reply_buf), NULL,
                                         request);
     if (r == -1)
       return false;
 
     Pickle reply(reinterpret_cast<char*>(reply_buf), r);
     void* iter = NULL;
     bool result;
     if (!reply.ReadBool(&iter, &result))
       return false;
     if (!result)
       return false;
 
     uint32_t reply_fileid;
     std::string reply_family;
+    bool resulting_bold, resulting_italic;
     if (!reply.ReadUInt32(&iter, &reply_fileid) ||
-        !reply.ReadString(&iter, &reply_family)) {
+        !reply.ReadString(&iter, &reply_family) ||
+        !reply.ReadBool(&iter, &resulting_bold) ||
+        !reply.ReadBool(&iter, &resulting_italic)) {
       return false;
     }
 
     *result_fileid = reply_fileid;
     if (result_family)
       *result_family = reply_family;
 
+    if (is_bold)
+      *is_bold = resulting_bold;
+    if (is_italic)
+      *is_italic = resulting_italic;
+
     return true;
 }
 
 int FontConfigIPC::Open(unsigned fileid) {
     Pickle request;
     request.WriteInt(METHOD_OPEN);
     request.WriteUInt32(fileid);
 
     int result_fd = -1;
     uint8_t reply_buf[256];
     const ssize_t r = base::SendRecvMsg(fd_, reply_buf, sizeof(reply_buf),
                                         &result_fd, request);
 
     if (r == -1)
       return -1;
 
     Pickle reply(reinterpret_cast<char*>(reply_buf), r);
     bool result;
     void* iter = NULL;
     if (!reply.ReadBool(&iter, &result) ||
         !result) {
       if (result_fd)
         close(result_fd);
       return -1;
     }
 
     return result_fd;
 }