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

Side by Side Diff: include/core/SkPaint.h

Issue 2326173002: use expected name for setDrawLooper/getDrawLooper (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | src/core/SkPaint.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 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 SkPaint_DEFINED 8 #ifndef SkPaint_DEFINED
9 #define SkPaint_DEFINED 9 #define SkPaint_DEFINED
10 10
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 void setRasterizer(sk_sp<SkRasterizer>); 646 void setRasterizer(sk_sp<SkRasterizer>);
647 647
648 SkImageFilter* getImageFilter() const { return fImageFilter.get(); } 648 SkImageFilter* getImageFilter() const { return fImageFilter.get(); }
649 SkImageFilter* setImageFilter(SkImageFilter*); 649 SkImageFilter* setImageFilter(SkImageFilter*);
650 void setImageFilter(sk_sp<SkImageFilter>); 650 void setImageFilter(sk_sp<SkImageFilter>);
651 651
652 /** 652 /**
653 * Return the paint's SkDrawLooper (if any). Does not affect the looper's 653 * Return the paint's SkDrawLooper (if any). Does not affect the looper's
654 * reference count. 654 * reference count.
655 */ 655 */
656 SkDrawLooper* getLooper() const { return fLooper.get(); } 656 SkDrawLooper* getDrawLooper() const { return fDrawLooper.get(); }
657 657 SkDrawLooper* getLooper() const { return fDrawLooper.get(); }
658 /** 658 /**
659 * Set or clear the looper object. 659 * Set or clear the looper object.
660 * <p /> 660 * <p />
661 * Pass NULL to clear any previous looper. 661 * Pass NULL to clear any previous looper.
662 * As a convenience, the parameter passed is also returned.
663 * If a previous looper exists in the paint, its reference count is 662 * If a previous looper exists in the paint, its reference count is
664 * decremented. If looper is not NULL, its reference count is 663 * decremented. If looper is not NULL, its reference count is
665 * incremented. 664 * incremented.
666 * @param looper May be NULL. The new looper to be installed in the paint. 665 * @param looper May be NULL. The new looper to be installed in the paint.
667 * @return looper
668 */ 666 */
667 void setDrawLooper(sk_sp<SkDrawLooper>);
669 #ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR 668 #ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR
670 SkDrawLooper* setLooper(SkDrawLooper* looper); 669 SkDrawLooper* setLooper(SkDrawLooper* looper);
671 #endif 670 #endif
672 void setLooper(sk_sp<SkDrawLooper>); 671 void setLooper(sk_sp<SkDrawLooper>);
673 672
674 enum Align { 673 enum Align {
675 kLeft_Align, 674 kLeft_Align,
676 kCenter_Align, 675 kCenter_Align,
677 kRight_Align, 676 kRight_Align,
678 }; 677 };
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 SK_TO_STRING_NONVIRT() 1087 SK_TO_STRING_NONVIRT()
1089 1088
1090 private: 1089 private:
1091 sk_sp<SkTypeface> fTypeface; 1090 sk_sp<SkTypeface> fTypeface;
1092 sk_sp<SkPathEffect> fPathEffect; 1091 sk_sp<SkPathEffect> fPathEffect;
1093 sk_sp<SkShader> fShader; 1092 sk_sp<SkShader> fShader;
1094 sk_sp<SkXfermode> fXfermode; 1093 sk_sp<SkXfermode> fXfermode;
1095 sk_sp<SkMaskFilter> fMaskFilter; 1094 sk_sp<SkMaskFilter> fMaskFilter;
1096 sk_sp<SkColorFilter> fColorFilter; 1095 sk_sp<SkColorFilter> fColorFilter;
1097 sk_sp<SkRasterizer> fRasterizer; 1096 sk_sp<SkRasterizer> fRasterizer;
1098 sk_sp<SkDrawLooper> fLooper; 1097 sk_sp<SkDrawLooper> fDrawLooper;
1099 sk_sp<SkImageFilter> fImageFilter; 1098 sk_sp<SkImageFilter> fImageFilter;
1100 1099
1101 SkScalar fTextSize; 1100 SkScalar fTextSize;
1102 SkScalar fTextScaleX; 1101 SkScalar fTextScaleX;
1103 SkScalar fTextSkewX; 1102 SkScalar fTextSkewX;
1104 SkColor fColor; 1103 SkColor fColor;
1105 SkScalar fWidth; 1104 SkScalar fWidth;
1106 SkScalar fMiterLimit; 1105 SkScalar fMiterLimit;
1107 union { 1106 union {
1108 struct { 1107 struct {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 friend class GrStencilAndCoverTextContext; 1208 friend class GrStencilAndCoverTextContext;
1210 friend class GrPathRendering; 1209 friend class GrPathRendering;
1211 friend class GrTextUtils; 1210 friend class GrTextUtils;
1212 friend class GrGLPathRendering; 1211 friend class GrGLPathRendering;
1213 friend class SkScalerContext; 1212 friend class SkScalerContext;
1214 friend class SkTextBaseIter; 1213 friend class SkTextBaseIter;
1215 friend class SkCanonicalizePaint; 1214 friend class SkCanonicalizePaint;
1216 }; 1215 };
1217 1216
1218 #endif 1217 #endif
OLDNEW
« no previous file with comments | « no previous file | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698