commit b2a4760135dbfe7f53d4a21512c561fd3b09e1bb
author Ben Wagner <bungeman@google.com> Thu May 09 16:35:58 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu May 09 16:35:58 2019 +0000
tree 044f71fe581358ea09f333d0a2cd66dbf0e64965
parent 94908c491899a1baf566826cc4faa253844b4e6a

Replace Skia font macros with enums.

This mechanically replaces kXXX_SkTextEncoding with SkTextEncoding::kXXX
and kXXX_SkFontHinting with SkFontHinting::kXXX. This will allow Skia to
remove these old macro constants and get everyone on the new enums.

Change-Id: Ibfc3544099dc93984a34a47d9512ddd2749f7557
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/54170
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 01db196..47c1fd2 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -907,7 +907,7 @@
       sk_sp<SkTypeface> typeface(SkSafeRef(m_pTypeFace.Get()));
       font.setTypeface(typeface);
     }
-    font.setHinting(kNo_SkFontHinting);
+    font.setHinting(SkFontHinting::kNone);
     font.setScaleX(m_scaleX);
     font.setSize(SkTAbs(m_fontSize));
     font.setSubpixel(true);
@@ -933,11 +933,11 @@
     if (m_rsxform.count()) {
       blob = SkTextBlob::MakeFromRSXform(m_glyphs.begin(), m_glyphs.bytes(),
                                          m_rsxform.begin(), font,
-                                         kGlyphID_SkTextEncoding);
+                                         SkTextEncoding::kGlyphID);
     } else {
       blob = SkTextBlob::MakeFromPosText(m_glyphs.begin(), m_glyphs.bytes(),
                                          m_positions.begin(), font,
-                                         kGlyphID_SkTextEncoding);
+                                         SkTextEncoding::kGlyphID);
     }
     skCanvas->drawTextBlob(blob, 0, 0, skPaint);
 
@@ -1565,7 +1565,7 @@
 
   SkFont font;
   font.setTypeface(typeface);
-  font.setHinting(kNo_SkFontHinting);
+  font.setHinting(SkFontHinting::kNone);
   font.setSize(SkTAbs(font_size));
   font.setSubpixel(true);
 
@@ -1631,7 +1631,7 @@
     }
     m_pCanvas->drawTextBlob(
         SkTextBlob::MakeFromRSXform(glyphs.begin(), nChars * 2, xforms.begin(),
-                                    font, kGlyphID_SkTextEncoding),
+                                    font, SkTextEncoding::kGlyphID),
         0, 0, paint);
   } else if (oneAtATime) {
     for (int index = 0; index < nChars; ++index) {
@@ -1641,7 +1641,7 @@
             1 == cp.m_AdjustMatrix[3]) {
           font.setScaleX(cp.m_AdjustMatrix[0]);
           auto blob = SkTextBlob::MakeFromText(&glyphs[index], 1, font,
-                                               kGlyphID_SkTextEncoding);
+                                               SkTextEncoding::kGlyphID);
           m_pCanvas->drawTextBlob(blob, positions[index].fX,
                                   positions[index].fY, paint);
           font.setScaleX(1);
@@ -1656,13 +1656,13 @@
           adjust.preTranslate(positions[index].fX, positions[index].fY);
           m_pCanvas->concat(adjust);
           auto blob = SkTextBlob::MakeFromText(&glyphs[index], 1, font,
-                                               kGlyphID_SkTextEncoding);
+                                               SkTextEncoding::kGlyphID);
           m_pCanvas->drawTextBlob(blob, 0, 0, paint);
           m_pCanvas->restore();
         }
       } else {
         auto blob = SkTextBlob::MakeFromText(&glyphs[index], 1, font,
-                                             kGlyphID_SkTextEncoding);
+                                             SkTextEncoding::kGlyphID);
         m_pCanvas->drawTextBlob(blob, positions[index].fX, positions[index].fY,
                                 paint);
       }
@@ -1670,7 +1670,7 @@
   } else {
     m_pCanvas->drawTextBlob(SkTextBlob::MakeFromPosText(
                                 glyphs.begin(), nChars * 2, positions.begin(),
-                                font, kGlyphID_SkTextEncoding),
+                                font, SkTextEncoding::kGlyphID),
                             0, 0, paint);
   }
   m_pCanvas->restore();