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

Side by Side Diff: src/fonts/SkGScalerContext.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 | « src/core/SkTypefacePriv.h ('k') | src/fonts/SkGScalerContext.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 2013 Google Inc. 2 * Copyright 2013 Google Inc.
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 SkGScalerContext_DEFINED 8 #ifndef SkGScalerContext_DEFINED
9 #define SkGScalerContext_DEFINED 9 #define SkGScalerContext_DEFINED
10 10
11 #include "SkScalerContext.h" 11 #include "SkScalerContext.h"
12 #include "SkTypeface.h" 12 #include "SkTypeface.h"
13 13
14 class SkGTypeface : public SkTypeface { 14 class SkGTypeface : public SkTypeface {
15 public: 15 public:
16 SkGTypeface(SkTypeface* proxy, const SkPaint&); 16 SkGTypeface(sk_sp<SkTypeface> proxy, const SkPaint&);
17 virtual ~SkGTypeface();
18 17
19 SkTypeface* proxy() const { return fProxy; } 18 SkTypeface* proxy() const { return fProxy.get(); }
20 const SkPaint& paint() const { return fPaint; } 19 const SkPaint& paint() const { return fPaint; }
21 20
22 protected: 21 protected:
23 SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, 22 SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
24 const SkDescriptor*) const override; 23 const SkDescriptor*) const override;
25 void onFilterRec(SkScalerContextRec*) const override; 24 void onFilterRec(SkScalerContextRec*) const override;
26 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( 25 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
27 PerGlyphInfo, 26 PerGlyphInfo,
28 const uint32_t* glyphIDs, 27 const uint32_t* glyphIDs,
29 uint32_t glyphIDsCount) const override; 28 uint32_t glyphIDsCount) const override;
30 SkStreamAsset* onOpenStream(int* ttcIndex) const override; 29 SkStreamAsset* onOpenStream(int* ttcIndex) const override;
31 void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override; 30 void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override;
32 31
33 int onCharsToGlyphs(const void* chars, Encoding encoding, 32 int onCharsToGlyphs(const void* chars, Encoding encoding,
34 uint16_t glyphs[], int glyphCount) const override; 33 uint16_t glyphs[], int glyphCount) const override;
35 int onCountGlyphs() const override; 34 int onCountGlyphs() const override;
36 int onGetUPEM() const override; 35 int onGetUPEM() const override;
37 36
38 void onGetFamilyName(SkString* familyName) const override; 37 void onGetFamilyName(SkString* familyName) const override;
39 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override; 38 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
40 39
41 int onGetTableTags(SkFontTableTag tags[]) const override; 40 int onGetTableTags(SkFontTableTag tags[]) const override;
42 size_t onGetTableData(SkFontTableTag, size_t offset, 41 size_t onGetTableData(SkFontTableTag, size_t offset,
43 size_t length, void* data) const override; 42 size_t length, void* data) const override;
44 43
45 private: 44 private:
46 SkTypeface* fProxy; 45 sk_sp<SkTypeface> fProxy;
47 SkPaint fPaint; 46 SkPaint fPaint;
48 }; 47 };
49 48
50 #endif 49 #endif
OLDNEW
« no previous file with comments | « src/core/SkTypefacePriv.h ('k') | src/fonts/SkGScalerContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698