commit 22aa7d7915156680128402c8399b21df8aa6a542
author Kevin Lubick <kjlubick@google.com> Tue Sep 15 09:23:29 2020 -0400
committer Kevin Lubick <kjlubick@google.com> Tue Sep 15 13:45:34 2020 +0000
tree 2aa74bca60537873901a3db7d79442d02db25044
parent c9bece21e074c9e2db74a319fdcdebd6844e1935

[canvaskit] Remove unnecessary ColorTypes

If we have removed any in error, we are happy to add them
back in upon request.

Bug: skia:10717
Change-Id: Ic7be83d6205866e12a9488be83034f15450eb098
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316842
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Nathaniel Nifong <nifong@google.com>

modules/canvaskit/CHANGELOG.md

diff --git a/modules/canvaskit/CHANGELOG.md b/modules/canvaskit/CHANGELOG.md
index 1169fc1..89bd4f6 100644
--- a/modules/canvaskit/CHANGELOG.md
+++ b/modules/canvaskit/CHANGELOG.md
@@ -48,6 +48,7 @@
    The same functionality can be had with the `CanvasKit.RRectXY` helper.
  - `SkPath.arcTo` which had been deprecated in favor of `SkPath.arcToOval`,
    `SkPath.arcToRotated`, `SkPath.arcToTangent`.
+ - Extraneous ColorTypes from `ColorType` enum.
 
 ### Added
  - `CanvasKit.LTRBiRect` and `CanvasKit.XYWHiRect` as helpers to create SkIRects.

modules/canvaskit/canvaskit_bindings.cpp

diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp
index 1ab77a8..e0c7075 100644
--- a/modules/canvaskit/canvaskit_bindings.cpp
+++ b/modules/canvaskit/canvaskit_bindings.cpp
@@ -1748,21 +1748,13 @@
     enum_<SkColorType>("ColorType")
         .value("Alpha_8", SkColorType::kAlpha_8_SkColorType)
         .value("RGB_565", SkColorType::kRGB_565_SkColorType)
-        .value("ARGB_4444", SkColorType::kARGB_4444_SkColorType)
         .value("RGBA_8888", SkColorType::kRGBA_8888_SkColorType)
-        .value("RGB_888x", SkColorType::kRGB_888x_SkColorType)
         .value("BGRA_8888", SkColorType::kBGRA_8888_SkColorType)
         .value("RGBA_1010102", SkColorType::kRGBA_1010102_SkColorType)
         .value("RGB_101010x", SkColorType::kRGB_101010x_SkColorType)
         .value("Gray_8", SkColorType::kGray_8_SkColorType)
         .value("RGBA_F16", SkColorType::kRGBA_F16_SkColorType)
-        .value("RGBA_F32", SkColorType::kRGBA_F32_SkColorType)
-        .value("R8G8_unorm", SkColorType::kR8G8_unorm_SkColorType)
-        .value("A16_unorm", SkColorType::kA16_unorm_SkColorType)
-        .value("R16G16_unorm", SkColorType::kR16G16_unorm_SkColorType)
-        .value("A16_float", SkColorType::kA16_float_SkColorType)
-        .value("R16G16_float", SkColorType::kR16G16_float_SkColorType)
-        .value("R16G16B16A16_unorm", SkColorType::kR16G16B16A16_unorm_SkColorType);
+        .value("RGBA_F32", SkColorType::kRGBA_F32_SkColorType);
 
     enum_<SkPathFillType>("FillType")
         .value("Winding",           SkPathFillType::kWinding)