commit 421ba88d1526d0ec299fa736455b0f7b09e13b10
author Kevin Lubick <kjlubick@google.com> Thu Oct 15 13:07:33 2020 -0400
committer Kevin Lubick <kjlubick@google.com> Thu Oct 15 17:09:24 2020 +0000
tree 3f3a48ebb347ee94686cd921efb896e94fba33f1
parent 1a364272be947b291bc830cf3fcb850c1d7be7b9

[canvaskit] Clean up Shader docs/types/names

There should be no functional changes.

I also address some forgotten changes to canvaskit-wasm-tests.ts
from CLs last week.

Bug: skia:10717
Change-Id: If02f60813af0aa42acd637639e40f4d6d0b38bd7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327157
Reviewed-by: Nathaniel Nifong <nifong@google.com>

modules/canvaskit/interface.js

diff --git a/modules/canvaskit/interface.js b/modules/canvaskit/interface.js
index b0ebaa1..7939821 100644
--- a/modules/canvaskit/interface.js
+++ b/modules/canvaskit/interface.js
@@ -1333,22 +1333,26 @@
     return dpe;
   }
 
-  CanvasKit.Shader.Color = function(color4f, colorSpace) {
+  CanvasKit.Shader.MakeColor = function(color4f, colorSpace) {
     colorSpace = colorSpace || null
     var cPtr = copyColorToWasm(color4f);
-    var result = CanvasKit.Shader._Color(cPtr, colorSpace);
-    return result;
+    return CanvasKit.Shader._MakeColor(cPtr, colorSpace);
   }
 
+  // TODO(kjlubick) remove deprecated names.
+  CanvasKit.Shader.Blend = CanvasKit.Shader.MakeBlend;
+  CanvasKit.Shader.Color = CanvasKit.Shader.MakeColor;
+  CanvasKit.Shader.Lerp = CanvasKit.Shader.MakeLerp;
+
   CanvasKit.Shader.MakeLinearGradient = function(start, end, colors, pos, mode, localMatrix, flags, colorSpace) {
     colorSpace = colorSpace || null
     var cPtrInfo = copyFlexibleColorArray(colors);
-    var posPtr =   copy1dArray(pos, 'HEAPF32');
+    var posPtr = copy1dArray(pos, 'HEAPF32');
     flags = flags || 0;
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
 
-    var lgs = CanvasKit._MakeLinearGradientShader(start, end, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
-                                                  cPtrInfo.count, mode, flags, localMatrixPtr, colorSpace);
+    var lgs = CanvasKit.Shader._MakeLinearGradient(start, end, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
+                                                   cPtrInfo.count, mode, flags, localMatrixPtr, colorSpace);
 
     freeArraysThatAreNotMallocedByUsers(cPtrInfo.colorPtr, colors);
     pos && freeArraysThatAreNotMallocedByUsers(posPtr, pos);
@@ -1358,12 +1362,12 @@
   CanvasKit.Shader.MakeRadialGradient = function(center, radius, colors, pos, mode, localMatrix, flags, colorSpace) {
     colorSpace = colorSpace || null
     var cPtrInfo = copyFlexibleColorArray(colors);
-    var posPtr =   copy1dArray(pos,    'HEAPF32');
+    var posPtr = copy1dArray(pos, 'HEAPF32');
     flags = flags || 0;
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
 
-    var rgs = CanvasKit._MakeRadialGradientShader(center, radius, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
-                                                  cPtrInfo.count, mode, flags, localMatrixPtr, colorSpace);
+    var rgs = CanvasKit.Shader._MakeRadialGradient(center, radius, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
+                                                   cPtrInfo.count, mode, flags, localMatrixPtr, colorSpace);
 
     freeArraysThatAreNotMallocedByUsers(cPtrInfo.colorPtr, colors);
     pos && freeArraysThatAreNotMallocedByUsers(posPtr, pos);
@@ -1373,16 +1377,16 @@
   CanvasKit.Shader.MakeSweepGradient = function(cx, cy, colors, pos, mode, localMatrix, flags, startAngle, endAngle, colorSpace) {
     colorSpace = colorSpace || null
     var cPtrInfo = copyFlexibleColorArray(colors);
-    var posPtr =   copy1dArray(pos,    'HEAPF32');
+    var posPtr = copy1dArray(pos, 'HEAPF32');
     flags = flags || 0;
     startAngle = startAngle || 0;
     endAngle = endAngle || 360;
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
 
-    var sgs = CanvasKit._MakeSweepGradientShader(cx, cy, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
-                                                 cPtrInfo.count, mode,
-                                                 startAngle, endAngle, flags,
-                                                 localMatrixPtr, colorSpace);
+    var sgs = CanvasKit.Shader._MakeSweepGradient(cx, cy, cPtrInfo.colorPtr, cPtrInfo.colorType, posPtr,
+                                                  cPtrInfo.count, mode,
+                                                  startAngle, endAngle, flags,
+                                                  localMatrixPtr, colorSpace);
 
     freeArraysThatAreNotMallocedByUsers(cPtrInfo.colorPtr, colors);
     pos && freeArraysThatAreNotMallocedByUsers(posPtr, pos);
@@ -1390,14 +1394,14 @@
   }
 
   CanvasKit.Shader.MakeTwoPointConicalGradient = function(start, startRadius, end, endRadius,
-                                                            colors, pos, mode, localMatrix, flags, colorSpace) {
+                                                          colors, pos, mode, localMatrix, flags, colorSpace) {
     colorSpace = colorSpace || null
     var cPtrInfo = copyFlexibleColorArray(colors);
-    var posPtr =   copy1dArray(pos,    'HEAPF32');
+    var posPtr =   copy1dArray(pos, 'HEAPF32');
     flags = flags || 0;
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
 
-    var rgs = CanvasKit._MakeTwoPointConicalGradientShader(
+    var rgs = CanvasKit.Shader._MakeTwoPointConicalGradient(
                           start, startRadius, end, endRadius, cPtrInfo.colorPtr, cPtrInfo.colorType,
                           posPtr, cPtrInfo.count, mode, flags, localMatrixPtr, colorSpace);