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

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

Issue 1852123002: Update SkXfermodeImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Overload Make methods Created 4 years, 8 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 | « gm/xfermodeimagefilter.cpp ('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 2013 The Android Open Source Project 2 * Copyright 2013 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 SkXfermodeImageFilter_DEFINED 8 #ifndef SkXfermodeImageFilter_DEFINED
9 #define SkXfermodeImageFilter_DEFINED 9 #define SkXfermodeImageFilter_DEFINED
10 10
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 12
13 class SkBitmap; 13 class SkBitmap;
14 class SkXfermode; 14 class SkXfermode;
15 15
16 class SK_API SkXfermodeImageFilter : public SkImageFilter { 16 class SK_API SkXfermodeImageFilter : public SkImageFilter {
17 /** 17 /**
18 * This filter takes an xfermode, and uses it to composite the foreground 18 * This filter takes an xfermode, and uses it to composite the foreground
19 * over the background. If foreground or background is NULL, the input 19 * over the background. If foreground or background is NULL, the input
20 * bitmap (src) is used instead. 20 * bitmap (src) is used instead.
21 */ 21 */
22 22
23 public: 23 public:
24 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* back ground, 24 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter > background,
25 SkImageFilter* foreground, const CropRect* cropRect); 25 sk_sp<SkImageFilter> foreground, const Crop Rect* cropRect);
26 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* back ground) { 26 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter > background) {
27 return Make(std::move(mode), background, nullptr, nullptr); 27 return Make(std::move(mode), std::move(background), nullptr, nullptr);
28 } 28 }
29
29 #ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR 30 #ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
30 static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background, 31 static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background,
31 SkImageFilter* foreground = NULL, 32 SkImageFilter* foreground = NULL,
32 const CropRect* cropRect = NULL) { 33 const CropRect* cropRect = NULL) {
33 return Make(sk_ref_sp(mode), background, foreground, cropRect).release() ; 34 return Make(sk_ref_sp(mode),
35 sk_ref_sp(background),
36 sk_ref_sp(foreground),
37 cropRect).release();
34 } 38 }
35 #endif 39 #endif
36 40 #ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
41 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* back ground,
42 SkImageFilter* foreground, const CropRect* cropRect) {
43 return Make(std::move(mode),
44 sk_ref_sp(background),
45 sk_ref_sp(foreground),
46 cropRect);
47 }
48 static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* back ground) {
49 return Make(std::move(mode), sk_ref_sp(background));
50 }
51 #endif
52
37 SK_TO_STRING_OVERRIDE() 53 SK_TO_STRING_OVERRIDE()
38 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter) 54 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter)
39 55
40 bool onFilterImageDeprecated(Proxy* proxy, 56 bool onFilterImageDeprecated(Proxy* proxy,
41 const SkBitmap& src, 57 const SkBitmap& src,
42 const Context& ctx, 58 const Context& ctx,
43 SkBitmap* dst, 59 SkBitmap* dst,
44 SkIPoint* offset) const override; 60 SkIPoint* offset) const override;
45 #if SK_SUPPORT_GPU 61 #if SK_SUPPORT_GPU
46 bool canFilterImageGPU() const override; 62 bool canFilterImageGPU() const override;
47 bool filterImageGPUDeprecated(Proxy* proxy, const SkBitmap& src, const Conte xt& ctx, 63 bool filterImageGPUDeprecated(Proxy* proxy, const SkBitmap& src, const Conte xt& ctx,
48 SkBitmap* result, SkIPoint* offset) const over ride; 64 SkBitmap* result, SkIPoint* offset) const over ride;
49 #endif 65 #endif
50 66
51 protected: 67 protected:
52 SkXfermodeImageFilter(sk_sp<SkXfermode> mode, SkImageFilter* inputs[2], 68 SkXfermodeImageFilter(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> inputs[2] ,
53 const CropRect* cropRect); 69 const CropRect* cropRect);
54 void flatten(SkWriteBuffer&) const override; 70 void flatten(SkWriteBuffer&) const override;
55 71
56 private: 72 private:
57 sk_sp<SkXfermode> fMode; 73 sk_sp<SkXfermode> fMode;
58 typedef SkImageFilter INHERITED; 74 typedef SkImageFilter INHERITED;
59 }; 75 };
60 76
61 #endif 77 #endif
OLDNEW
« no previous file with comments | « gm/xfermodeimagefilter.cpp ('k') | samplecode/SampleFilterFuzz.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698