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

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

Issue 1933393002: Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Restore deleted Android code. Created 4 years, 7 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/SkFont.h ('k') | include/core/SkTypeface.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 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 /** Set or clear the typeface object. 607 /** Set or clear the typeface object.
608 <p /> 608 <p />
609 Pass NULL to clear any previous typeface. 609 Pass NULL to clear any previous typeface.
610 As a convenience, the parameter passed is also returned. 610 As a convenience, the parameter passed is also returned.
611 If a previous typeface exists, its reference count is decremented. 611 If a previous typeface exists, its reference count is decremented.
612 If typeface is not NULL, its reference count is incremented. 612 If typeface is not NULL, its reference count is incremented.
613 @param typeface May be NULL. The new typeface to be installed in the 613 @param typeface May be NULL. The new typeface to be installed in the
614 paint 614 paint
615 @return typeface 615 @return typeface
616 */ 616 */
617 void setTypeface(sk_sp<SkTypeface>);
618 #ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
617 SkTypeface* setTypeface(SkTypeface* typeface); 619 SkTypeface* setTypeface(SkTypeface* typeface);
618 void setTypeface(sk_sp<SkTypeface>); 620 #endif
619 621
620 /** Get the paint's rasterizer (or NULL). 622 /** Get the paint's rasterizer (or NULL).
621 <p /> 623 <p />
622 The raster controls how paths/text are turned into alpha masks. 624 The raster controls how paths/text are turned into alpha masks.
623 @return the paint's rasterizer (or NULL) 625 @return the paint's rasterizer (or NULL)
624 */ 626 */
625 SkRasterizer* getRasterizer() const { return fRasterizer.get(); } 627 SkRasterizer* getRasterizer() const { return fRasterizer.get(); }
626 628
627 /** Set or clear the rasterizer object. 629 /** Set or clear the rasterizer object.
628 <p /> 630 <p />
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 friend class GrStencilAndCoverTextContext; 1170 friend class GrStencilAndCoverTextContext;
1169 friend class GrPathRendering; 1171 friend class GrPathRendering;
1170 friend class GrTextUtils; 1172 friend class GrTextUtils;
1171 friend class GrGLPathRendering; 1173 friend class GrGLPathRendering;
1172 friend class SkScalerContext; 1174 friend class SkScalerContext;
1173 friend class SkTextBaseIter; 1175 friend class SkTextBaseIter;
1174 friend class SkCanonicalizePaint; 1176 friend class SkCanonicalizePaint;
1175 }; 1177 };
1176 1178
1177 #endif 1179 #endif
OLDNEW
« no previous file with comments | « include/core/SkFont.h ('k') | include/core/SkTypeface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698