diff options
| author |  Mike Reed <reed@google.com> | 2017-02-25 22:34:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-26 18:36:11 +0000 |
| commit | a07741a75aa694c0e7c00c2301c9de2daf9b5f9e (patch) | |
| tree | 88b0e9edea463244040c89a91587c9db57165c73 /samplecode | |
| parent | eb090ef4569dcd73dfd49e64ca2f4f733fbf27bc (diff) | |
begin to hide details of SkPathEffect
BUG=skia:
Change-Id: I155d2370ae894e6000b6a768d02cf06bf5b3de6e
Reviewed-on: https://skia-review.googlesource.com/8977
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleAll.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 4 | ||||
| -rw-r--r-- | samplecode/SamplePathEffects.cpp | 4 | ||||
| -rw-r--r-- | samplecode/SampleSlides.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index a098eb6c16..37a0c4b871 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -490,7 +490,7 @@ protected: gPhase, SkPath1DPathEffect::kRotate_Style); auto inner = SkDiscretePathEffect::Make(SkIntToScalar(2), SkIntToScalar(1)/10); // SkCornerPathEffect(SkIntToScalar(2)); - return SkComposePathEffect::Make(outer, inner); + return SkPathEffect::MakeCompose(outer, inner); } sk_sp<SkShader> shaderTest() { diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index d90476aef7..5524f1e852 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -422,7 +422,7 @@ static sk_sp<SkPathEffect> make_path_effect(bool canBeNull = true) { pathEffect = SkArcToPathEffect::Make(make_scalar(true)); break; case 1: - pathEffect = SkComposePathEffect::Make(make_path_effect(false), + pathEffect = SkPathEffect::MakeCompose(make_path_effect(false), make_path_effect(false)); break; case 2: @@ -452,7 +452,7 @@ static sk_sp<SkPathEffect> make_path_effect(bool canBeNull = true) { break; case 8: default: - pathEffect = SkSumPathEffect::Make(make_path_effect(false), + pathEffect = SkPathEffect::MakeSum(make_path_effect(false), make_path_effect(false)); break; } diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp index 1f9915d378..3d9ba9cb36 100644 --- a/samplecode/SamplePathEffects.cpp +++ b/samplecode/SamplePathEffects.cpp @@ -45,7 +45,7 @@ static sk_sp<SkPathEffect> make_pe(int flags, SkScalar phase) { auto inner = SkCornerPathEffect::Make(SkIntToScalar(CORNER_RADIUS)); - return SkComposePathEffect::Make(outer, inner); + return SkPathEffect::MakeCompose(outer, inner); } static sk_sp<SkPathEffect> make_warp_pe(SkScalar phase) { @@ -61,7 +61,7 @@ static sk_sp<SkPathEffect> make_warp_pe(SkScalar phase) { path, 12, phase, SkPath1DPathEffect::kMorph_Style); auto inner = SkCornerPathEffect::Make(SkIntToScalar(CORNER_RADIUS)); - return SkComposePathEffect::Make(outer, inner); + return SkPathEffect::MakeCompose(outer, inner); } /////////////////////////////////////////////////////////// diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index c1c49b4ab1..2322c24446 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -34,7 +34,7 @@ static void compose_pe(SkPaint* paint) { sk_sp<SkPathEffect> corner = SkCornerPathEffect::Make(25); sk_sp<SkPathEffect> compose; if (pe) { - compose = SkComposePathEffect::Make(sk_ref_sp(pe), corner); + compose = SkPathEffect::MakeCompose(sk_ref_sp(pe), corner); } else { compose = corner; } |