| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPathEffect_DEFINED | 10 #ifndef SkPathEffect_DEFINED |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 a compound pathEffect. | 178 a compound pathEffect. |
| 179 */ | 179 */ |
| 180 class SkComposePathEffect : public SkPairPathEffect { | 180 class SkComposePathEffect : public SkPairPathEffect { |
| 181 public: | 181 public: |
| 182 /** Construct a pathEffect whose effect is to apply first the inner pathEffe
ct | 182 /** Construct a pathEffect whose effect is to apply first the inner pathEffe
ct |
| 183 and the the outer pathEffect (e.g. outer(inner(path))) | 183 and the the outer pathEffect (e.g. outer(inner(path))) |
| 184 The reference counts for outer and inner are both incremented in the con
structor, | 184 The reference counts for outer and inner are both incremented in the con
structor, |
| 185 and decremented in the destructor. | 185 and decremented in the destructor. |
| 186 */ | 186 */ |
| 187 static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner)
{ | 187 static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner)
{ |
| 188 return SkNEW_ARGS(SkComposePathEffect, (outer, inner)); | 188 return new SkComposePathEffect(outer, inner); |
| 189 } | 189 } |
| 190 | 190 |
| 191 virtual bool filterPath(SkPath* dst, const SkPath& src, | 191 virtual bool filterPath(SkPath* dst, const SkPath& src, |
| 192 SkStrokeRec*, const SkRect*) const override; | 192 SkStrokeRec*, const SkRect*) const override; |
| 193 | 193 |
| 194 SK_TO_STRING_OVERRIDE() | 194 SK_TO_STRING_OVERRIDE() |
| 195 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) | 195 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) |
| 196 | 196 |
| 197 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 197 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 198 bool exposedInAndroidJavaAPI() const override { return true; } | 198 bool exposedInAndroidJavaAPI() const override { return true; } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 215 Its filterPath() returns true if either of the effects succeeded. | 215 Its filterPath() returns true if either of the effects succeeded. |
| 216 */ | 216 */ |
| 217 class SkSumPathEffect : public SkPairPathEffect { | 217 class SkSumPathEffect : public SkPairPathEffect { |
| 218 public: | 218 public: |
| 219 /** Construct a pathEffect whose effect is to apply two effects, in sequence
. | 219 /** Construct a pathEffect whose effect is to apply two effects, in sequence
. |
| 220 (e.g. first(path) + second(path)) | 220 (e.g. first(path) + second(path)) |
| 221 The reference counts for first and second are both incremented in the co
nstructor, | 221 The reference counts for first and second are both incremented in the co
nstructor, |
| 222 and decremented in the destructor. | 222 and decremented in the destructor. |
| 223 */ | 223 */ |
| 224 static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) { | 224 static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) { |
| 225 return SkNEW_ARGS(SkSumPathEffect, (first, second)); | 225 return new SkSumPathEffect(first, second); |
| 226 } | 226 } |
| 227 | 227 |
| 228 virtual bool filterPath(SkPath* dst, const SkPath& src, | 228 virtual bool filterPath(SkPath* dst, const SkPath& src, |
| 229 SkStrokeRec*, const SkRect*) const override; | 229 SkStrokeRec*, const SkRect*) const override; |
| 230 | 230 |
| 231 SK_TO_STRING_OVERRIDE() | 231 SK_TO_STRING_OVERRIDE() |
| 232 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) | 232 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) |
| 233 | 233 |
| 234 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 234 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 235 bool exposedInAndroidJavaAPI() const override { return true; } | 235 bool exposedInAndroidJavaAPI() const override { return true; } |
| 236 #endif | 236 #endif |
| 237 | 237 |
| 238 protected: | 238 protected: |
| 239 SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) : INHERITED(first
, second) {} | 239 SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) : INHERITED(first
, second) {} |
| 240 | 240 |
| 241 private: | 241 private: |
| 242 // illegal | 242 // illegal |
| 243 SkSumPathEffect(const SkSumPathEffect&); | 243 SkSumPathEffect(const SkSumPathEffect&); |
| 244 SkSumPathEffect& operator=(const SkSumPathEffect&); | 244 SkSumPathEffect& operator=(const SkSumPathEffect&); |
| 245 | 245 |
| 246 typedef SkPairPathEffect INHERITED; | 246 typedef SkPairPathEffect INHERITED; |
| 247 }; | 247 }; |
| 248 | 248 |
| 249 #endif | 249 #endif |
| OLD | NEW |