Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: include/effects/SkDashPathEffect.h

Issue 1721743002: Revert of fix misc asserts and checks found by fuzzer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/effects/Sk1DPathEffect.h ('k') | samplecode/SampleFilterFuzz.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 SkDashPathEffect_DEFINED 8 #ifndef SkDashPathEffect_DEFINED
9 #define SkDashPathEffect_DEFINED 9 #define SkDashPathEffect_DEFINED
10 10
(...skipping 18 matching lines...) Expand all
29 10 pixels on 29 10 pixels on
30 20 pixels off 30 20 pixels off
31 10 pixels on 31 10 pixels on
32 20 pixels off 32 20 pixels off
33 ... 33 ...
34 A phase of -5, 25, 55, 85, etc. would all result in the same path, 34 A phase of -5, 25, 55, 85, etc. would all result in the same path,
35 because the sum of all the intervals is 30. 35 because the sum of all the intervals is 30.
36 36
37 Note: only affects stroked paths. 37 Note: only affects stroked paths.
38 */ 38 */
39 static SkPathEffect* Create(const SkScalar intervals[], int count, SkScalar phase); 39 static SkPathEffect* Create(const SkScalar intervals[], int count, SkScalar phase) {
40 return new SkDashPathEffect(intervals, count, phase);
41 }
42 virtual ~SkDashPathEffect();
40 43
41 virtual bool filterPath(SkPath* dst, const SkPath& src, 44 virtual bool filterPath(SkPath* dst, const SkPath& src,
42 SkStrokeRec*, const SkRect*) const override; 45 SkStrokeRec*, const SkRect*) const override;
43 46
44 virtual bool asPoints(PointData* results, const SkPath& src, 47 virtual bool asPoints(PointData* results, const SkPath& src,
45 const SkStrokeRec&, const SkMatrix&, 48 const SkStrokeRec&, const SkMatrix&,
46 const SkRect*) const override; 49 const SkRect*) const override;
47 50
48 DashType asADash(DashInfo* info) const override; 51 DashType asADash(DashInfo* info) const override;
49 52
50 SK_TO_STRING_OVERRIDE() 53 SK_TO_STRING_OVERRIDE()
51 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashPathEffect) 54 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashPathEffect)
52 55
53 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK 56 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
54 bool exposedInAndroidJavaAPI() const override { return true; } 57 bool exposedInAndroidJavaAPI() const override { return true; }
55 #endif 58 #endif
56 59
57 protected: 60 protected:
58 virtual ~SkDashPathEffect();
59 SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase); 61 SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase);
60 void flatten(SkWriteBuffer&) const override; 62 void flatten(SkWriteBuffer&) const override;
61 63
62 private: 64 private:
63 SkScalar* fIntervals; 65 SkScalar* fIntervals;
64 int32_t fCount; 66 int32_t fCount;
65 SkScalar fPhase; 67 SkScalar fPhase;
66 // computed from phase 68 // computed from phase
67
68 SkScalar fInitialDashLength; 69 SkScalar fInitialDashLength;
69 int32_t fInitialDashIndex; 70 int32_t fInitialDashIndex;
70 SkScalar fIntervalLength; 71 SkScalar fIntervalLength;
71 72
72 typedef SkPathEffect INHERITED; 73 typedef SkPathEffect INHERITED;
73 }; 74 };
74 75
75 #endif 76 #endif
OLDNEW
« no previous file with comments | « include/effects/Sk1DPathEffect.h ('k') | samplecode/SampleFilterFuzz.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698