| OLD | NEW | 
|---|
| 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 23 matching lines...) Expand all  Loading... | 
| 34 class SkSurfaceProps; | 34 class SkSurfaceProps; | 
| 35 class SkTypeface; | 35 class SkTypeface; | 
| 36 | 36 | 
| 37 #define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag | 37 #define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag | 
| 38 | 38 | 
| 39 /** \class SkPaint | 39 /** \class SkPaint | 
| 40 | 40 | 
| 41     The SkPaint class holds the style and color information about how to draw | 41     The SkPaint class holds the style and color information about how to draw | 
| 42     geometries, text and bitmaps. | 42     geometries, text and bitmaps. | 
| 43 */ | 43 */ | 
| 44 |  | 
| 45 class SK_API SkPaint { | 44 class SK_API SkPaint { | 
| 46 public: | 45 public: | 
| 47     SkPaint(); | 46     SkPaint(); | 
| 48     SkPaint(const SkPaint& paint); | 47     SkPaint(const SkPaint& paint); | 
| 49     SkPaint(SkPaint&& paint); | 48     SkPaint(SkPaint&& paint); | 
| 50     ~SkPaint(); | 49     ~SkPaint(); | 
| 51 | 50 | 
| 52     SkPaint& operator=(const SkPaint&); | 51     SkPaint& operator=(const SkPaint&); | 
| 53     SkPaint& operator=(SkPaint&&); | 52     SkPaint& operator=(SkPaint&&); | 
| 54 | 53 | 
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 582     /** Set or clear the maskfilter object. | 581     /** Set or clear the maskfilter object. | 
| 583         <p /> | 582         <p /> | 
| 584         Pass NULL to clear any previous maskfilter. | 583         Pass NULL to clear any previous maskfilter. | 
| 585         As a convenience, the parameter passed is also returned. | 584         As a convenience, the parameter passed is also returned. | 
| 586         If a previous maskfilter exists, its reference count is decremented. | 585         If a previous maskfilter exists, its reference count is decremented. | 
| 587         If maskfilter is not NULL, its reference count is incremented. | 586         If maskfilter is not NULL, its reference count is incremented. | 
| 588         @param maskfilter   May be NULL. The new maskfilter to be installed in | 587         @param maskfilter   May be NULL. The new maskfilter to be installed in | 
| 589                             the paint | 588                             the paint | 
| 590         @return             maskfilter | 589         @return             maskfilter | 
| 591     */ | 590     */ | 
|  | 591 #ifdef SK_SUPPORT_LEGACY_MASKFILTER_PTR | 
| 592     SkMaskFilter* setMaskFilter(SkMaskFilter* maskfilter); | 592     SkMaskFilter* setMaskFilter(SkMaskFilter* maskfilter); | 
|  | 593 #endif | 
| 593     void setMaskFilter(sk_sp<SkMaskFilter>); | 594     void setMaskFilter(sk_sp<SkMaskFilter>); | 
| 594 | 595 | 
| 595     // These attributes are for text/fonts | 596     // These attributes are for text/fonts | 
| 596 | 597 | 
| 597     /** Get the paint's typeface object. | 598     /** Get the paint's typeface object. | 
| 598         <p /> | 599         <p /> | 
| 599         The typeface object identifies which font to use when drawing or | 600         The typeface object identifies which font to use when drawing or | 
| 600         measuring text. The typeface reference count is not affected. | 601         measuring text. The typeface reference count is not affected. | 
| 601         @return the paint's typeface (or NULL) | 602         @return the paint's typeface (or NULL) | 
| 602     */ | 603     */ | 
| (...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1158     friend class GrStencilAndCoverTextContext; | 1159     friend class GrStencilAndCoverTextContext; | 
| 1159     friend class GrPathRendering; | 1160     friend class GrPathRendering; | 
| 1160     friend class GrTextUtils; | 1161     friend class GrTextUtils; | 
| 1161     friend class GrGLPathRendering; | 1162     friend class GrGLPathRendering; | 
| 1162     friend class SkScalerContext; | 1163     friend class SkScalerContext; | 
| 1163     friend class SkTextBaseIter; | 1164     friend class SkTextBaseIter; | 
| 1164     friend class SkCanonicalizePaint; | 1165     friend class SkCanonicalizePaint; | 
| 1165 }; | 1166 }; | 
| 1166 | 1167 | 
| 1167 #endif | 1168 #endif | 
| OLD | NEW | 
|---|