commit a538e46d5f9348a6a4b5868d30c1435f9dfd1140
author Kevin Lubick <kjlubick@google.com> Wed Jan 22 15:18:03 2020 -0500
committer Kevin Lubick <kjlubick@google.com> Wed Jan 22 20:35:54 2020 +0000
tree b9b0ab2549ae5312dcbbfbf83d530b21d32e6d7b
parent 319524ba724e414108abcd5dd601e0a055397466

[canvaskit] Fix color opaqueness

Bug: skia:9800
Change-Id: I61d50df47467dbcee6d90fd636749a4d19c4da8f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265957
Reviewed-by: Brian Osman <brianosman@google.com>

modules/canvaskit/CHANGELOG.md

diff --git a/modules/canvaskit/CHANGELOG.md b/modules/canvaskit/CHANGELOG.md
index 12a3d0c..468d229 100644
--- a/modules/canvaskit/CHANGELOG.md
+++ b/modules/canvaskit/CHANGELOG.md
@@ -18,7 +18,7 @@
 ### Fixed
  - Bug that sometimes resulted in 'Cannot perform Construct on a neutered ArrayBuffer'
  - Bug with SkImage.readPixels (skbug.com/9788)
-
+ - Bug with transparent colors in Canvas2d mode (skbug.com/9800)
 
 ## [0.11.0] - 2020-01-10
 

modules/canvaskit/htmlcanvas/color.js

diff --git a/modules/canvaskit/htmlcanvas/color.js b/modules/canvaskit/htmlcanvas/color.js
index 49a56f7..7fe17a1 100644
--- a/modules/canvaskit/htmlcanvas/color.js
+++ b/modules/canvaskit/htmlcanvas/color.js
@@ -31,7 +31,10 @@
 }
 
 function valueOrPercent(aStr) {
-  var a = parseFloat(aStr) || 1;
+  if (aStr === undefined) {
+    return 1; // default to opaque.
+  }
+  var a = parseFloat(aStr);
   if (aStr && aStr.indexOf('%') !== -1) {
     return a / 100;
   }

modules/canvaskit/tests/canvas2d.spec.js

diff --git a/modules/canvaskit/tests/canvas2d.spec.js b/modules/canvaskit/tests/canvas2d.spec.js
index f19db09..1569d64 100644
--- a/modules/canvaskit/tests/canvas2d.spec.js
+++ b/modules/canvaskit/tests/canvas2d.spec.js
@@ -44,6 +44,12 @@
                     CanvasKit.Color(117, 33, 64, 1.0));
                 expect(parseColor('rgb(117,33, 64)')).toEqual(
                     CanvasKit.Color(117, 33, 64, 1.0));
+                expect(parseColor('rgb(117,33, 64, 32%)')).toEqual(
+                    CanvasKit.Color(117, 33, 64, 0.32));
+                expect(parseColor('rgb(117,33, 64, 0.001)')).toEqual(
+                    CanvasKit.Color(117, 33, 64, 0.001));
+                expect(parseColor('rgb(117,33,64,0)')).toEqual(
+                    CanvasKit.Color(117, 33, 64, 0.0));
                 done();
             }));
         });