From 844ef4291cd447f7c66100be39348207aea9b8c7 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Fri, 13 Apr 2018 15:06:42 +0530
Subject: [PATCH] PepperFlashRendererHost to use SkFontStyle.

https://chromium-review.googlesource.com/c/chromium/src/+/602469
---
 .../renderer/pepper/pepper_flash_renderer_host.cc  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 5aabe7032f4c..2340f9352d84 100644
--- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -27,6 +27,7 @@
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkFontStyle.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPoint.h"
@@ -197,14 +198,13 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
     return PP_ERROR_FAILED;
 
   // Set up the typeface.
-  int style = SkTypeface::kNormal;
-  if (static_cast<PP_BrowserFont_Trusted_Weight>(params.font_desc.weight) >=
-      PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD)
-    style |= SkTypeface::kBold;
+  int weight = (params.font_desc.weight + 1) * 100;
+  SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
   if (params.font_desc.italic)
-    style |= SkTypeface::kItalic;
-  sk_sp<SkTypeface> typeface(SkTypeface::MakeFromName(
-      params.font_desc.face.c_str(), SkFontStyle::FromOldStyle(style)));
+    slant = SkFontStyle::kItalic_Slant;
+  SkFontStyle style(weight, SkFontStyle::kNormal_Width, slant);
+  sk_sp<SkTypeface> typeface(
+      SkTypeface::MakeFromName(params.font_desc.face.c_str(), style));
   if (!typeface)
     return PP_ERROR_FAILED;