export SkFont from PaintFlags

Bug: skia:2664
Change-Id: Icf69c8361ae1ff939d95ba3ac74d080ea9027525
Reviewed-on: https://chromium-review.googlesource.com/c/1343658Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: vmpstr <vmpstr@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610110}

cc/paint/paint_flags.cc

@@ -151,6 +151,23 @@ SkPaint PaintFlags::ToSkPaint() const {
   return paint;
 }
 
+SkFont PaintFlags::ToSkFont() const {
+  SkFont font;
+  font.setTypeface(typeface_);
+  font.setSize(text_size_);
+  font.setHinting(static_cast<SkFontHinting>(getHinting()));
+  font.setForceAutoHinting(isAutohinted());
+  font.setSubpixel(isSubpixelText());
+  if (isAntiAlias()) {
+    if (isLCDRenderText()) {
+      font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
+    } else {
+      font.setEdging(SkFont::Edging::kAntiAlias);
+    }
+  }
+  return font;
+}
+
 bool PaintFlags::IsValid() const {
   return PaintOp::IsValidPaintFlagsSkBlendMode(getBlendMode());
 }

cc/paint/paint_flags.h

@@ -11,6 +11,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "third_party/skia/include/core/SkFont.h"
 #include "third_party/skia/include/core/SkFontTypes.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMaskFilter.h"
@@ -19,8 +20,6 @@
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
-class SkPaint;
-
 namespace cc {
 class PaintFilter;
 
@@ -210,6 +209,7 @@ class CC_PAINT_EXPORT PaintFlags {
   bool SupportsFoldingAlpha() const;
 
   SkPaint ToSkPaint() const;
+  SkFont ToSkFont() const;
 
   bool IsValid() const;
   bool operator==(const PaintFlags& other) const;

ui/gfx/harfbuzz_font_skia.cc

@@ -65,16 +65,15 @@ void GetGlyphWidthAndExtents(cc::PaintFlags* flags,
                              hb_codepoint_t codepoint,
                              hb_position_t* width,
                              hb_glyph_extents_t* extents) {
-  SkPaint paint = flags->ToSkPaint();
+  SkFont font = flags->ToSkFont();
 
   DCHECK_LE(codepoint, std::numeric_limits<uint16_t>::max());
-  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
   SkScalar sk_width;
   SkRect sk_bounds;
   uint16_t glyph = static_cast<uint16_t>(codepoint);
 
-  paint.getTextWidths(&glyph, sizeof(glyph), &sk_width, &sk_bounds);
+  font.getWidths(&glyph, 1, &sk_width, &sk_bounds);
   if (width)
     *width = SkiaScalarToHarfBuzzUnits(sk_width);
   if (extents) {
@@ -100,9 +99,8 @@ hb_bool_t GetGlyph(hb_font_t* font,
 
   bool exists = cache->count(unicode) != 0;
   if (!exists) {
-    font_data->flags_.setTextEncoding(cc::PaintFlags::kUTF32_TextEncoding);
-    SkPaint paint = font_data->flags_.ToSkPaint();
-    paint.textToGlyphs(&unicode, sizeof(hb_codepoint_t), &(*cache)[unicode]);
+    (*cache)[unicode] =
+        font_data->flags_.getTypeface()->unicharToGlyph(unicode);
   }
   *glyph = (*cache)[unicode];
   return !!*glyph;