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

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

Issue 173633003: Factory methods for heap-allocated SkMaskFilter objects. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
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 SkEmbossMaskFilter_DEFINED 8 #ifndef SkEmbossMaskFilter_DEFINED
9 #define SkEmbossMaskFilter_DEFINED 9 #define SkEmbossMaskFilter_DEFINED
10 10
11 #include "SkMaskFilter.h" 11 #include "SkMaskFilter.h"
12 12
13 /** \class SkEmbossMaskFilter 13 /** \class SkEmbossMaskFilter
14 14
15 This mask filter creates a 3D emboss look, by specifying a light and blur am ount. 15 This mask filter creates a 3D emboss look, by specifying a light and blur am ount.
16 */ 16 */
17 class SK_API SkEmbossMaskFilter : public SkMaskFilter { 17 class SK_API SkEmbossMaskFilter : public SkMaskFilter {
18 public: 18 public:
19 struct Light { 19 struct Light {
20 SkScalar fDirection[3]; // x,y,z 20 SkScalar fDirection[3]; // x,y,z
21 uint16_t fPad; 21 uint16_t fPad;
22 uint8_t fAmbient; 22 uint8_t fAmbient;
23 uint8_t fSpecular; // exponent, 4.4 right now 23 uint8_t fSpecular; // exponent, 4.4 right now
24 }; 24 };
25 25
26 SkEmbossMaskFilter(SkScalar blurSigma, const Light& light); 26 static SkEmbossMaskFilter* Create(SkScalar blurSigma, const Light& light) {
27 return SkNEW_ARGS(SkEmbossMaskFilter, (blurSigma, light));
28 }
27 29
28 SK_ATTR_DEPRECATED("use sigma version") 30 SK_ATTR_DEPRECATED("use sigma version")
29 SkEmbossMaskFilter(const Light& light, SkScalar blurRadius); 31 static SkEmbossMaskFilter* Create(const Light& light, SkScalar blurRadius) {
scroggo 2014/02/20 14:17:07 No need to create a factory for the deprecated con
Dominik Grewe 2014/02/20 16:38:11 Done.
32 return SkNEW_ARGS(SkEmbossMaskFilter, (light, blurRadius));
33 }
30 34
31 // overrides from SkMaskFilter 35 // overrides from SkMaskFilter
32 // This method is not exported to java. 36 // This method is not exported to java.
33 virtual SkMask::Format getFormat() const SK_OVERRIDE; 37 virtual SkMask::Format getFormat() const SK_OVERRIDE;
34 // This method is not exported to java. 38 // This method is not exported to java.
35 virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, 39 virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
36 SkIPoint* margin) const SK_OVERRIDE; 40 SkIPoint* margin) const SK_OVERRIDE;
37 41
38 SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) 42 SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;)
39 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter) 43 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter)
40 44
41 protected: 45 protected:
42 SkEmbossMaskFilter(SkReadBuffer&); 46 SkEmbossMaskFilter(SkReadBuffer&);
43 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 47 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
44 48
49 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
50 public:
51 #endif
52 SkEmbossMaskFilter(SkScalar blurSigma, const Light& light);
53 SkEmbossMaskFilter(const Light& light, SkScalar blurRadius);
scroggo 2014/02/20 14:17:07 This constructor can be removed entirely (once you
Dominik Grewe 2014/02/20 16:38:11 Done.
54
45 private: 55 private:
46 Light fLight; 56 Light fLight;
47 SkScalar fBlurSigma; 57 SkScalar fBlurSigma;
48 58
49 typedef SkMaskFilter INHERITED; 59 typedef SkMaskFilter INHERITED;
50 }; 60 };
51 61
52 #endif 62 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698