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

Side by Side Diff: src/core/SkModeColorFilter.h

Issue 1827433002: Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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 | « src/core/SkDevice.cpp ('k') | src/core/SkModeColorFilter.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 2016 Google Inc. 2 * Copyright 2016 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 #include "SkColorFilter.h" 8 #include "SkColorFilter.h"
9 #include "SkXfermode.h" 9 #include "SkXfermode.h"
10 10
11 #ifndef SkModeColorFilter_DEFINED 11 #ifndef SkModeColorFilter_DEFINED
12 #define SkModeColorFilter_DEFINED 12 #define SkModeColorFilter_DEFINED
13 13
14 class SkModeColorFilter : public SkColorFilter { 14 class SkModeColorFilter : public SkColorFilter {
15 public: 15 public:
16 static sk_sp<SkColorFilter> Make(SkColor color, SkXfermode::Mode mode) {
17 return sk_sp<SkColorFilter>(new SkModeColorFilter(color, mode));
18 }
19 #ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
16 static SkColorFilter* Create(SkColor color, SkXfermode::Mode mode) { 20 static SkColorFilter* Create(SkColor color, SkXfermode::Mode mode) {
17 return new SkModeColorFilter(color, mode); 21 return Make(color, mode).release();
18 } 22 }
23 #endif
19 24
20 SkColor getColor() const { return fColor; } 25 SkColor getColor() const { return fColor; }
21 SkXfermode::Mode getMode() const { return fMode; } 26 SkXfermode::Mode getMode() const { return fMode; }
22 SkPMColor getPMColor() const { return fPMColor; } 27 SkPMColor getPMColor() const { return fPMColor; }
23 28
24 bool asColorMode(SkColor*, SkXfermode::Mode*) const override; 29 bool asColorMode(SkColor*, SkXfermode::Mode*) const override;
25 uint32_t getFlags() const override; 30 uint32_t getFlags() const override;
26 void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) con st override; 31 void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) con st override;
27 void filterSpan4f(const SkPM4f shader[], int count, SkPM4f result[]) const o verride; 32 void filterSpan4f(const SkPM4f shader[], int count, SkPM4f result[]) const o verride;
28 33
(...skipping 23 matching lines...) Expand all
52 SkXfermodeProc fProc; 57 SkXfermodeProc fProc;
53 58
54 void updateCache(); 59 void updateCache();
55 60
56 friend class SkColorFilter; 61 friend class SkColorFilter;
57 62
58 typedef SkColorFilter INHERITED; 63 typedef SkColorFilter INHERITED;
59 }; 64 };
60 65
61 #endif 66 #endif
OLDNEW
« no previous file with comments | « src/core/SkDevice.cpp ('k') | src/core/SkModeColorFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698