Clean up Enums in Canvaskit

 - Removed inverse filltypes
 - Removed StrokeAndFill Paint Style
 - Removed TextEncoding (all functions assume UTF-8)

Change-Id: Ie2824042b48b3dcefb41ef761bb3070df894da75
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/276099
Commit-Queue: Nathaniel Nifong <[email protected]>
Reviewed-by: Kevin Lubick <[email protected]>

Author: Nathaniel Nifong

modules/canvaskit/CHANGELOG.md

@@ -23,6 +23,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
  - Stop compiling jpeg and webp encoders, for a smaller binary.
 
+### Removed
+ - Removed inverse filltypes
+ - Removed StrokeAndFill paint style
+ - Removed TextEncoding enum (it was only used internally). All functions assume UTF-8.
+
 ## [0.13.0] - 2020-02-28
 
 ### Deprecated

modules/canvaskit/canvaskit_bindings.cpp

@@ -1520,20 +1520,18 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .class_function("_MakeFromRSXform", optional_override([](uintptr_t /* char* */ sptr,
                                                               size_t strBtyes,
                                                               uintptr_t /* SkRSXform* */ xptr,
-                                                              const SkFont& font,
-                                                              SkTextEncoding encoding)->sk_sp<SkTextBlob> {
+                                                              const SkFont& font)->sk_sp<SkTextBlob> {
             // See comment above for uintptr_t explanation
             const char* str = reinterpret_cast<const char*>(sptr);
             const SkRSXform* xforms = reinterpret_cast<const SkRSXform*>(xptr);
 
-            return SkTextBlob::MakeFromRSXform(str, strBtyes, xforms, font, encoding);
+            return SkTextBlob::MakeFromRSXform(str, strBtyes, xforms, font, SkTextEncoding::kUTF8);
         }), allow_raw_pointers())
         .class_function("_MakeFromText", optional_override([](uintptr_t /* char* */ sptr,
-                                                              size_t len, const SkFont& font,
-                                                              SkTextEncoding encoding)->sk_sp<SkTextBlob> {
+                                                              size_t len, const SkFont& font)->sk_sp<SkTextBlob> {
             // See comment above for uintptr_t explanation
             const char* str = reinterpret_cast<const char*>(sptr);
-            return SkTextBlob::MakeFromText(str, len, font, encoding);
+            return SkTextBlob::MakeFromText(str, len, font, SkTextEncoding::kUTF8);
         }), allow_raw_pointers());
 
     class_<SkTypeface>("SkTypeface")
@@ -1643,24 +1641,22 @@ EMSCRIPTEN_BINDINGS(Skia) {
 
     enum_<SkPathFillType>("FillType")
         .value("Winding",           SkPathFillType::kWinding)
-        .value("EvenOdd",           SkPathFillType::kEvenOdd)
-        .value("InverseWinding",    SkPathFillType::kInverseWinding)
-        .value("InverseEvenOdd",    SkPathFillType::kInverseEvenOdd);
+        .value("EvenOdd",           SkPathFillType::kEvenOdd);
 
     enum_<SkFilterQuality>("FilterQuality")
         .value("None",   SkFilterQuality::kNone_SkFilterQuality)
         .value("Low",    SkFilterQuality::kLow_SkFilterQuality)
         .value("Medium", SkFilterQuality::kMedium_SkFilterQuality)
         .value("High",   SkFilterQuality::kHigh_SkFilterQuality);
 
+    // Only used to control the encode function.
     enum_<SkEncodedImageFormat>("ImageFormat")
         .value("PNG",  SkEncodedImageFormat::kPNG)
         .value("JPEG", SkEncodedImageFormat::kJPEG);
 
     enum_<SkPaint::Style>("PaintStyle")
         .value("Fill",            SkPaint::Style::kFill_Style)
-        .value("Stroke",          SkPaint::Style::kStroke_Style)
-        .value("StrokeAndFill",   SkPaint::Style::kStrokeAndFill_Style);
+        .value("Stroke",          SkPaint::Style::kStroke_Style);
 
 #ifdef SK_INCLUDE_PATHOPS
     enum_<SkPathOp>("PathOp")
@@ -1692,12 +1688,6 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .value("Slight", SkFontHinting::kSlight)
         .value("Normal", SkFontHinting::kNormal)
         .value("Full",   SkFontHinting::kFull);
-
-    enum_<SkTextEncoding>("TextEncoding")
-        .value("UTF8",    SkTextEncoding::kUTF8)
-        .value("UTF16",   SkTextEncoding::kUTF16)
-        .value("UTF32",   SkTextEncoding::kUTF32)
-        .value("GlyphID", SkTextEncoding::kGlyphID);
 #endif
 
     enum_<SkTileMode>("TileMode")

modules/canvaskit/externs.js

@@ -625,8 +625,6 @@ var CanvasKit = {
   FillType: {
     Winding: {},
     EvenOdd: {},
-    InverseWinding: {},
-    InverseEvenOdd: {},
   },
 
   FilterQuality: {
@@ -683,7 +681,6 @@ var CanvasKit = {
   PaintStyle: {
     Fill: {},
     Stroke: {},
-    StrokeAndFill: {},
   },
 
   PathOp: {
@@ -739,13 +736,6 @@ var CanvasKit = {
     RTL: {},
   },
 
-  TextEncoding: {
-    UTF8: {},
-    UTF16: {},
-    UTF32: {},
-    GlyphID: {},
-  },
-
   TileMode: {
     Clamp: {},
     Repeat: {},

modules/canvaskit/font.js

@@ -161,8 +161,7 @@ CanvasKit._extraInitializations.push(function() {
     stringToUTF8(str, strPtr, strLen);
     var rptr = rsxBuilder.build();
 
-    var blob = CanvasKit.SkTextBlob._MakeFromRSXform(strPtr, strLen - 1,
-                          rptr, font, CanvasKit.TextEncoding.UTF8);
+    var blob = CanvasKit.SkTextBlob._MakeFromRSXform(strPtr, strLen - 1, rptr, font);
     if (!blob) {
       SkDebug('Could not make textblob from string "' + str + '"');
       return null;
@@ -185,7 +184,7 @@ CanvasKit._extraInitializations.push(function() {
     // Add 1 for the null terminator.
     stringToUTF8(str, strPtr, strLen);
 
-    var blob = CanvasKit.SkTextBlob._MakeFromText(strPtr, strLen - 1, font, CanvasKit.TextEncoding.UTF8);
+    var blob = CanvasKit.SkTextBlob._MakeFromText(strPtr, strLen - 1, font);
     if (!blob) {
       SkDebug('Could not make textblob from string "' + str + '"');
       return null;