[pathkit][canvaskit] roll versions
This removes the buggy .then() constructor, primarily.
Docs-Preview: https://skia.org/?cl=195126
Bug: skia:
Change-Id: Ie20512267ce3f822eb0d68e71fc07f3d3245c1e9
Reviewed-on: https://skia-review.googlesource.com/c/195126
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/experimental/canvaskit/CHANGELOG.md b/experimental/canvaskit/CHANGELOG.md
index c5c8dfb..1224921 100644
--- a/experimental/canvaskit/CHANGELOG.md
+++ b/experimental/canvaskit/CHANGELOG.md
@@ -6,6 +6,9 @@
## [Unreleased]
+
+## [0.4.0] - 2019-02-25
+
### Added
- `SkPath.addRoundRect`, `SkPath.reset`, `SkPath.rewind` exposed.
- `SkCanvas.drawArc`, `SkCanvas.drawLine`, `SkCanvas.drawOval`, `SkCanvas.drawRoundRect` exposed.
@@ -24,6 +27,7 @@
### Removed
- `SkPaint.setTextSize()`, `SkPaint.getTextSize()`, `SkPaint.setTypeface()`
which should be replaced by using `SkFont`.
+ - Deprecated `CanvasKitInit().then()` interface (see 0.3.1 notes)
### Fixed
diff --git a/experimental/canvaskit/canvaskit/package.json b/experimental/canvaskit/canvaskit/package.json
index 91c17dd..2603152 100644
--- a/experimental/canvaskit/canvaskit/package.json
+++ b/experimental/canvaskit/canvaskit/package.json
@@ -1,6 +1,6 @@
{
"name": "canvaskit-wasm",
- "version": "0.3.1",
+ "version": "0.4.0",
"description": "A WASM version of Skia's Canvas API",
"main": "bin/canvaskit.js",
"homepage": "https://github.com/google/skia/tree/master/experimental/canvaskit",
diff --git a/experimental/canvaskit/ready.js b/experimental/canvaskit/ready.js
index 66f2a0e..60f2486 100644
--- a/experimental/canvaskit/ready.js
+++ b/experimental/canvaskit/ready.js
@@ -3,7 +3,6 @@
// and why the below fixes it.
Module['ready'] = function() {
return new Promise(function (resolve, reject) {
- delete Module['then'];
Module['onAbort'] = reject;
if (runtimeInitialized) {
resolve(Module);
@@ -14,5 +13,4 @@
}
});
}
-// TODO(kjlubick): Shut .then() entirely off in 0.4.0 by uncommenting below.
-// delete Module['then'];
\ No newline at end of file
+delete Module['then'];
\ No newline at end of file
diff --git a/modules/pathkit/CHANGELOG.md b/modules/pathkit/CHANGELOG.md
index 6cde21c..1867982 100644
--- a/modules/pathkit/CHANGELOG.md
+++ b/modules/pathkit/CHANGELOG.md
@@ -6,9 +6,16 @@
## [Unreleased]
+
+
+## [0.6.0] 2019-02-25
+
### Fixed
- Potential bug in `ready()` if already loaded.
+### Removed
+ - Deprecated `PathKitInit.then()` see 0.5.1 notes.
+
## [0.5.1] 2019-01-04
### Changed
diff --git a/modules/pathkit/npm-asmjs/package.json b/modules/pathkit/npm-asmjs/package.json
index 70f773c..9a88f7f 100644
--- a/modules/pathkit/npm-asmjs/package.json
+++ b/modules/pathkit/npm-asmjs/package.json
@@ -1,6 +1,6 @@
{
"name": "pathkit-asmjs",
- "version": "0.5.1",
+ "version": "0.6.0",
"description": "A asm.js version of Skia's PathOps toolkit",
"main": "bin/pathkit.js",
"homepage": "https://github.com/google/skia/tree/master/modules/pathkit",
diff --git a/modules/pathkit/npm-wasm/package.json b/modules/pathkit/npm-wasm/package.json
index a09c0b3..23fc0a6 100644
--- a/modules/pathkit/npm-wasm/package.json
+++ b/modules/pathkit/npm-wasm/package.json
@@ -1,6 +1,6 @@
{
"name": "pathkit-wasm",
- "version": "0.5.1",
+ "version": "0.6.0",
"description": "A WASM version of Skia's PathOps toolkit",
"main": "bin/pathkit.js",
"homepage": "https://github.com/google/skia/tree/master/modules/pathkit",
diff --git a/modules/pathkit/ready.js b/modules/pathkit/ready.js
index e054f62..60f2486 100644
--- a/modules/pathkit/ready.js
+++ b/modules/pathkit/ready.js
@@ -3,7 +3,6 @@
// and why the below fixes it.
Module['ready'] = function() {
return new Promise(function (resolve, reject) {
- delete Module['then'];
Module['onAbort'] = reject;
if (runtimeInitialized) {
resolve(Module);
@@ -14,5 +13,4 @@
}
});
}
-// TODO(kjlubick): Shut .then() entirely off in 0.6.0 by uncommenting below.
-// delete Module['then'];
\ No newline at end of file
+delete Module['then'];
\ No newline at end of file
diff --git a/site/user/modules/canvaskit.md b/site/user/modules/canvaskit.md
index c079729..443a999 100644
--- a/site/user/modules/canvaskit.md
+++ b/site/user/modules/canvaskit.md
@@ -96,7 +96,7 @@
var locate_file = '';
if (window.WebAssembly && typeof window.WebAssembly.compile === 'function') {
console.log('WebAssembly is supported!');
- locate_file = 'https://unpkg.com/canvaskit-wasm@0.3.0/bin/';
+ locate_file = 'https://unpkg.com/canvaskit-wasm@0.3.1/bin/';
} else {
console.log('WebAssembly is not supported (yet) on this browser.');
document.getElementById('demo').innerHTML = "<div>WASM not supported by your browser. Try a recent version of Chrome, Firefox, Edge, or Safari.</div>";
@@ -112,7 +112,7 @@
var fullBounds = {fLeft: 0, fTop: 0, fRight: 500, fBottom: 500};
CanvasKitInit({
locateFile: (file) => locate_file + file,
- }).then((CK) => {
+ }).ready().then((CK) => {
CanvasKit = CK;
DrawingExample(CanvasKit);
InkExample(CanvasKit);