| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 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 SkComposeImageFilter_DEFINED | 8 #ifndef SkComposeImageFilter_DEFINED |
| 9 #define SkComposeImageFilter_DEFINED | 9 #define SkComposeImageFilter_DEFINED |
| 10 | 10 |
| 11 #include "SkImageFilter.h" | 11 #include "SkImageFilter.h" |
| 12 | 12 |
| 13 class SK_API SkComposeImageFilter : public SkImageFilter { | 13 class SK_API SkComposeImageFilter : public SkImageFilter { |
| 14 public: | 14 public: |
| 15 static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { | 15 static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> outer, sk_sp<SkImageFi
lter> inner) { |
| 16 if (!outer) { | 16 if (!outer) { |
| 17 return SkSafeRef(inner); | 17 return inner; |
| 18 } | 18 } |
| 19 if (!inner) { | 19 if (!inner) { |
| 20 return SkRef(outer); | 20 return outer; |
| 21 } | 21 } |
| 22 SkImageFilter* inputs[2] = { outer, inner }; | 22 sk_sp<SkImageFilter> inputs[2] = { std::move(outer), std::move(inner) }; |
| 23 return new SkComposeImageFilter(inputs); | 23 return sk_sp<SkImageFilter>(new SkComposeImageFilter(inputs)); |
| 24 } | 24 } |
| 25 SkRect computeFastBounds(const SkRect& src) const override; | 25 SkRect computeFastBounds(const SkRect& src) const override; |
| 26 | 26 |
| 27 SK_TO_STRING_OVERRIDE() | 27 SK_TO_STRING_OVERRIDE() |
| 28 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) | 28 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) |
| 29 | 29 |
| 30 #ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR |
| 31 static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { |
| 32 return Make(sk_ref_sp<SkImageFilter>(outer), |
| 33 sk_ref_sp<SkImageFilter>(inner)).release(); |
| 34 } |
| 35 #endif |
| 36 |
| 30 protected: | 37 protected: |
| 31 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input
s) { | 38 explicit SkComposeImageFilter(sk_sp<SkImageFilter> inputs[2]) : INHERITED(in
puts, 2, nullptr) { |
| 32 SkASSERT(inputs[0]); | 39 SkASSERT(inputs[0].get()); |
| 33 SkASSERT(inputs[1]); | 40 SkASSERT(inputs[1].get()); |
| 34 } | 41 } |
| 35 sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&, | 42 sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&, |
| 36 SkIPoint* offset) const override; | 43 SkIPoint* offset) const override; |
| 37 SkIRect onFilterBounds(const SkIRect&, const SkMatrix&, MapDirection) const
override; | 44 SkIRect onFilterBounds(const SkIRect&, const SkMatrix&, MapDirection) const
override; |
| 38 | 45 |
| 39 private: | 46 private: |
| 40 typedef SkImageFilter INHERITED; | 47 typedef SkImageFilter INHERITED; |
| 41 }; | 48 }; |
| 42 | 49 |
| 43 #endif | 50 #endif |
| OLD | NEW |