Move Make functions for corner and discrete path effects into namespaces.
Deprecates MakeSkCornerPathEffect in favor of SkCornerPathEffect.Make
Deprecates MakeSkDiscretePathEffect in favor of SkDiscretePathEffect.Make
Bug: skia:9843
Change-Id: I5a5b79838d1212605c6cb0b124dc0eabde8a4b4d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268629
Commit-Queue: Nathaniel Nifong <nifong@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/modules/canvaskit/CHANGELOG.md b/modules/canvaskit/CHANGELOG.md
index 536496c..2582285 100644
--- a/modules/canvaskit/CHANGELOG.md
+++ b/modules/canvaskit/CHANGELOG.md
@@ -5,6 +5,13 @@
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+
+### Deprecated
+ - `MakeSkCornerPathEffect` will be renamed soon. Calls can be replaced with
+ `PathEffect.MakeCorner`.
+ - `MakeSkDiscretePathEffect` will be renamed soon. Calls can be replaced with
+ `PathEffect.MakeDiscrete`.
+
### Added
- `SkSurface.drawOnce` for drawing a single frame (in addition to already existing
`SkSurface.requestAnimationFrame` for animation logic).
diff --git a/modules/canvaskit/canvaskit/example.html b/modules/canvaskit/canvaskit/example.html
index f537d7f..009782a 100644
--- a/modules/canvaskit/canvaskit/example.html
+++ b/modules/canvaskit/canvaskit/example.html
@@ -256,7 +256,7 @@
paint.setColor(CanvasKit.Color(0, 0, 0, 1.0));
paint.setStyle(CanvasKit.PaintStyle.Stroke);
paint.setStrokeWidth(4.0);
- paint.setPathEffect(CanvasKit.MakeSkCornerPathEffect(50));
+ paint.setPathEffect(CanvasKit.SkPathEffect.MakeCorner(50));
// Draw I N K
let path = new CanvasKit.SkPath();
diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp
index 4c4964c..130f598 100644
--- a/modules/canvaskit/canvaskit_bindings.cpp
+++ b/modules/canvaskit/canvaskit_bindings.cpp
@@ -738,7 +738,9 @@
}), allow_raw_pointers());
function("getSkDataBytes", &getSkDataBytes, allow_raw_pointers());
+ // Deprecated: use Canvaskit.SkPathEffect.MakeCorner
function("MakeSkCornerPathEffect", &SkCornerPathEffect::Make, allow_raw_pointers());
+ // Deprecated: use Canvaskit.SkPathEffect.MakeDiscrete
function("MakeSkDiscretePathEffect", &SkDiscretePathEffect::Make, allow_raw_pointers());
// Deprecated: use Canvaskit.SkMaskFilter.MakeBlur
function("MakeBlurMaskFilter", optional_override([](SkBlurStyle style, SkScalar sigma, bool respectCTM)->sk_sp<SkMaskFilter> {
@@ -1245,7 +1247,9 @@
.function("setStyle", &SkPaint::setStyle);
class_<SkPathEffect>("SkPathEffect")
- .smart_ptr<sk_sp<SkPathEffect>>("sk_sp<SkPathEffect>");
+ .smart_ptr<sk_sp<SkPathEffect>>("sk_sp<SkPathEffect>")
+ .class_function("MakeCorner", &SkCornerPathEffect::Make)
+ .class_function("MakeDiscrete", &SkDiscretePathEffect::Make);
class_<SkPath>("SkPath")
.constructor<>()