| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef Sk1DPathEffect_DEFINED | 8 #ifndef Sk1DPathEffect_DEFINED |
| 9 #define Sk1DPathEffect_DEFINED | 9 #define Sk1DPathEffect_DEFINED |
| 10 | 10 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 kLastEnum_Style = kMorph_Style, | 49 kLastEnum_Style = kMorph_Style, |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 /** Dash by replicating the specified path. | 52 /** Dash by replicating the specified path. |
| 53 @param path The path to replicate (dash) | 53 @param path The path to replicate (dash) |
| 54 @param advance The space between instances of path | 54 @param advance The space between instances of path |
| 55 @param phase distance (mod advance) along path for its initial position | 55 @param phase distance (mod advance) along path for its initial position |
| 56 @param style how to transform path at each point (based on the current | 56 @param style how to transform path at each point (based on the current |
| 57 position and tangent) | 57 position and tangent) |
| 58 */ | 58 */ |
| 59 static sk_sp<SkPathEffect> Make(const SkPath& path, SkScalar advance, SkScal
ar phase, Style); | 59 static SkPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar p
hase, Style); |
| 60 | |
| 61 #ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR | |
| 62 static SkPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar p
hase, Style s) { | |
| 63 return Make(path, advance, phase, s).release(); | |
| 64 } | |
| 65 #endif | |
| 66 | 60 |
| 67 virtual bool filterPath(SkPath*, const SkPath&, | 61 virtual bool filterPath(SkPath*, const SkPath&, |
| 68 SkStrokeRec*, const SkRect*) const override; | 62 SkStrokeRec*, const SkRect*) const override; |
| 69 | 63 |
| 70 SK_TO_STRING_OVERRIDE() | 64 SK_TO_STRING_OVERRIDE() |
| 71 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) | 65 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) |
| 72 | 66 |
| 73 protected: | 67 protected: |
| 74 SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Sty
le); | 68 SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Sty
le); |
| 75 void flatten(SkWriteBuffer&) const override; | 69 void flatten(SkWriteBuffer&) const override; |
| 76 | 70 |
| 77 // overrides from Sk1DPathEffect | 71 // overrides from Sk1DPathEffect |
| 78 SkScalar begin(SkScalar contourLength) const override; | 72 SkScalar begin(SkScalar contourLength) const override; |
| 79 SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const override; | 73 SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const override; |
| 80 | 74 |
| 81 private: | 75 private: |
| 82 SkPath fPath; // copied from constructor | 76 SkPath fPath; // copied from constructor |
| 83 SkScalar fAdvance; // copied from constructor | 77 SkScalar fAdvance; // copied from constructor |
| 84 SkScalar fInitialOffset; // computed from phase | 78 SkScalar fInitialOffset; // computed from phase |
| 85 Style fStyle; // copied from constructor | 79 Style fStyle; // copied from constructor |
| 86 | 80 |
| 87 typedef Sk1DPathEffect INHERITED; | 81 typedef Sk1DPathEffect INHERITED; |
| 88 }; | 82 }; |
| 89 | 83 |
| 90 #endif | 84 #endif |
| OLD | NEW |