use new font api -- aa and subpixel no longer deprecated

TBR=vmpstr

Bug: skia:2664
Change-Id: I736158e11434fdf561328e20fee6bef01ba43ae9
Reviewed-on: https://chromium-review.googlesource.com/c/1337827
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608837}

cc/paint/oop_pixeltest.cc

@@ -1408,9 +1408,8 @@ sk_sp<SkTextBlob> BuildTextBlob(
   font.setHinting(SkFontHinting::kNormal);
   font.setSize(1u);
   if (use_lcd_text) {
-    font.DEPRECATED_setAntiAlias(true);
     font.setSubpixel(true);
-    font.DEPRECATED_setLCDRender(true);
+    font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
   }
 
   SkTextBlobBuilder builder;

skia/config/SkUserConfig.h

@@ -145,10 +145,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #define SK_USE_LEGACY_DISTANCE_FIELDS
 #endif
 
-#ifndef SK_SUPPORT_LEGACY_FONT_FLAGS
-#define SK_SUPPORT_LEGACY_FONT_FLAGS
-#endif
-
 // Skia is enabling this feature soon. Chrome probably does
 // not want it for M64
 #ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION

third_party/blink/renderer/platform/fonts/mac/font_platform_data_mac.mm

@@ -197,14 +197,19 @@ void FontPlatformData::SetupSkFont(SkFont* skfont,
         LayoutTestSupport::IsTextSubpixelPositioningAllowedForTest();
   }
 
-  skfont->DEPRECATED_setAntiAlias(should_antialias);
+  if (should_antialias && should_smooth_fonts) {
+    skfont->setEdging(SkFont::Edging::kSubpixelAntiAlias);
+  } else if (should_antialias) {
+    skfont->setEdging(SkFont::Edging::kAntiAlias);
+  } else {
+    skfont->setEdging(SkFont::Edging::kAlias);
+  }
   skfont->setEmbeddedBitmaps(false);
   const float ts = text_size_ >= 0 ? text_size_ : 12;
   skfont->setSize(SkFloatToScalar(ts));
   skfont->setTypeface(typeface_);
   skfont->setEmbolden(synthetic_bold_);
   skfont->setSkewX(synthetic_italic_ ? -SK_Scalar1 / 4 : 0);
-  skfont->DEPRECATED_setLCDRender(should_smooth_fonts);
   skfont->setSubpixel(should_subpixel_position);
 
   // When rendering using CoreGraphics, disable hinting when

third_party/blink/renderer/platform/fonts/web_font_render_style.cc

@@ -119,12 +119,16 @@ void WebFontRenderStyle::ApplyToSkPaint(SkPaint& font,
 void WebFontRenderStyle::ApplyToSkFont(SkFont* font,
                                        float device_scale_factor) const {
   auto sk_hint_style = static_cast<SkFontHinting>(hint_style);
-  font->DEPRECATED_setAntiAlias(use_anti_alias);
   font->setHinting(sk_hint_style);
   font->setEmbeddedBitmaps(use_bitmaps);
   font->setForceAutoHinting(use_auto_hint);
-  if (use_anti_alias)
-    font->DEPRECATED_setLCDRender(use_subpixel_rendering);
+  if (use_anti_alias && use_subpixel_rendering) {
+    font->setEdging(SkFont::Edging::kSubpixelAntiAlias);
+  } else if (use_anti_alias) {
+    font->setEdging(SkFont::Edging::kAntiAlias);
+  } else {
+    font->setEdging(SkFont::Edging::kAlias);
+  }
 
   // Force-enable subpixel positioning, except when full hinting is requested on
   // low-dpi screen or when running layout tests.

third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc

@@ -80,10 +80,13 @@ void FontPlatformData::SetupSkFont(SkFont* font, float, const Font*) const {
   font->setSkewX(synthetic_italic_ ? -SK_Scalar1 / 4 : 0);
 
   uint32_t text_flags = PaintTextFlags();
-  font->DEPRECATED_setAntiAlias(
-      SkToBool(text_flags & SkPaint::kAntiAlias_Flag));
-  font->DEPRECATED_setLCDRender(
-      SkToBool(text_flags & SkPaint::kLCDRenderText_Flag));
+  if (text_flags & SkPaint::kLCDRenderText_Flag) {
+    font->setEdging(SkFont::Edging::kSubpixelAntiAlias);
+  } else if (text_flags & SkPaint::kAntiAlias_Flag) {
+    font->setEdging(SkFont::Edging::kAntiAlias);
+  } else {
+    font->setEdging(SkFont::Edging::kAlias);
+  }
   font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag));
 
   // Only use sub-pixel positioning if anti aliasing is enabled. Otherwise,