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

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

Issue 1820303002: Revert of switch colorfilters to sk_sp (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 | « include/core/SkColorFilter.h ('k') | include/core/SkShader.h » ('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 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 */ 508 */
509 SkColorFilter* getColorFilter() const { return fColorFilter.get(); } 509 SkColorFilter* getColorFilter() const { return fColorFilter.get(); }
510 510
511 /** Set or clear the paint's colorfilter, returning the parameter. 511 /** Set or clear the paint's colorfilter, returning the parameter.
512 <p /> 512 <p />
513 If the paint already has a filter, its reference count is decremented. 513 If the paint already has a filter, its reference count is decremented.
514 If filter is not NULL, its reference count is incremented. 514 If filter is not NULL, its reference count is incremented.
515 @param filter May be NULL. The filter to be installed in the paint 515 @param filter May be NULL. The filter to be installed in the paint
516 @return filter 516 @return filter
517 */ 517 */
518 #ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
519 SkColorFilter* setColorFilter(SkColorFilter* filter); 518 SkColorFilter* setColorFilter(SkColorFilter* filter);
520 #endif
521 void setColorFilter(sk_sp<SkColorFilter>); 519 void setColorFilter(sk_sp<SkColorFilter>);
522 520
523 /** Get the paint's xfermode object. 521 /** Get the paint's xfermode object.
524 <p /> 522 <p />
525 The xfermode's reference count is not affected. 523 The xfermode's reference count is not affected.
526 @return the paint's xfermode (or NULL) 524 @return the paint's xfermode (or NULL)
527 */ 525 */
528 SkXfermode* getXfermode() const { return fXfermode.get(); } 526 SkXfermode* getXfermode() const { return fXfermode.get(); }
529 527
530 /** Set or clear the xfermode object. 528 /** Set or clear the xfermode object.
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 friend class GrStencilAndCoverTextContext; 1152 friend class GrStencilAndCoverTextContext;
1155 friend class GrPathRendering; 1153 friend class GrPathRendering;
1156 friend class GrTextUtils; 1154 friend class GrTextUtils;
1157 friend class GrGLPathRendering; 1155 friend class GrGLPathRendering;
1158 friend class SkScalerContext; 1156 friend class SkScalerContext;
1159 friend class SkTextBaseIter; 1157 friend class SkTextBaseIter;
1160 friend class SkCanonicalizePaint; 1158 friend class SkCanonicalizePaint;
1161 }; 1159 };
1162 1160
1163 #endif 1161 #endif
OLDNEW
« no previous file with comments | « include/core/SkColorFilter.h ('k') | include/core/SkShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698