Move legacyCreateTypeface to SkFontStyle.

components/font_service/public/cpp/font_service_thread.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/font_service/public/cpp/font_service_thread.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
@@ skipping 13 matching lines @@
     : base::Thread(kFontThreadName),
       font_service_info_(font_service.PassInterface()) {
   base::Thread::Options options;
   options.message_pump_factory =
       base::Bind(&mojo::common::MessagePumpMojo::Create);
   StartWithOptions(options);
 }
 
 bool FontServiceThread::MatchFamilyName(
     const char family_name[],
-    SkTypeface::Style requested_style,
+    SkFontStyle requested_style,
     SkFontConfigInterface::FontIdentity* out_font_identity,
     SkString* out_family_name,
-    SkTypeface::Style* out_style) {
+    SkFontStyle* out_style) {
   DCHECK_NE(GetThreadId(), base::PlatformThread::CurrentId());
 
   bool out_valid = false;
   // This proxies to the other thread, which proxies to mojo. Only on the reply
   // from mojo do we return from this.
   base::WaitableEvent done_event(false, false);
   task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&FontServiceThread::MatchFamilyNameImpl, this, &done_event,
                  family_name, requested_style, &out_valid, out_font_identity,
@@ skipping 30 matching lines @@
   return mapped_font_file;
 }
 
 FontServiceThread::~FontServiceThread() {
   Stop();
 }
 
 void FontServiceThread::MatchFamilyNameImpl(
     base::WaitableEvent* done_event,
     const char family_name[],
-    SkTypeface::Style requested_style,
+    SkFontStyle requested_style,
     bool* out_valid,
     SkFontConfigInterface::FontIdentity* out_font_identity,
     SkString* out_family_name,
-    SkTypeface::Style* out_style) {
+    SkFontStyle* out_style) {
   DCHECK_EQ(GetThreadId(), base::PlatformThread::CurrentId());
 
+  TypefaceStylePtr style(TypefaceStyle::New());
+  style->weight = requested_style.weight();
+  style->width = requested_style.width();
+  style->slant = static_cast<TypefaceSlant>(requested_style.slant());
+
   font_service_->MatchFamilyName(
-      mojo::String(family_name), static_cast<TypefaceStyle>(requested_style),
+      mojo::String(family_name), std::move(style),
       base::Bind(&FontServiceThread::OnMatchFamilyNameComplete, this,
                  done_event, out_valid, out_font_identity, out_family_name,
                  out_style));
 }
 
 void FontServiceThread::OnMatchFamilyNameComplete(
     base::WaitableEvent* done_event,
     bool* out_valid,
     SkFontConfigInterface::FontIdentity* out_font_identity,
     SkString* out_family_name,
-    SkTypeface::Style* out_style,
+    SkFontStyle* out_style,
     FontIdentityPtr font_identity,
     mojo::String family_name,
-    TypefaceStyle style) {
+    TypefaceStylePtr style) {
   DCHECK_EQ(GetThreadId(), base::PlatformThread::CurrentId());
 
   *out_valid = font_identity;
   if (font_identity) {
     out_font_identity->fID = font_identity->id;
     out_font_identity->fTTCIndex = font_identity->ttc_index;
     out_font_identity->fString = font_identity->str_representation.data();
     // TODO(erg): fStyle isn't set. This is rather odd, however it matches the
     // behaviour of the current Linux IPC version.
 
     *out_family_name = family_name.data();
-    *out_style = static_cast<SkTypeface::Style>(style);
+    *out_style = SkFontStyle(style->weight,
+                             style->width,
+                             static_cast<SkFontStyle::Slant>(style->slant));
   }
 
   done_event->Signal();
 }
 
 void FontServiceThread::OpenStreamImpl(base::WaitableEvent* done_event,
                                        base::File* output_file,
                                        const uint32_t id_number) {
   DCHECK_EQ(GetThreadId(), base::PlatformThread::CurrentId());
 
@@ skipping 18 matching lines @@
 void FontServiceThread::Init() {
   font_service_.Bind(std::move(font_service_info_));
 }
 
 void FontServiceThread::CleanUp() {
   font_service_.reset();
 }
 
 }  // namespace internal
 }  // namespace font_service