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

Side by Side Diff: src/fonts/SkGScalerContext.h

Issue 1974783002: Revert of Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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
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(sk_sp<SkTypeface> proxy, const SkPaint&); 16 SkGTypeface(SkTypeface* proxy, const SkPaint&);
17 virtual ~SkGTypeface();
17 18
18 SkTypeface* proxy() const { return fProxy.get(); } 19 SkTypeface* proxy() const { return fProxy; }
19 const SkPaint& paint() const { return fPaint; } 20 const SkPaint& paint() const { return fPaint; }
20 21
21 protected: 22 protected:
22 SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, 23 SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
23 const SkDescriptor*) const override; 24 const SkDescriptor*) const override;
24 void onFilterRec(SkScalerContextRec*) const override; 25 void onFilterRec(SkScalerContextRec*) const override;
25 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( 26 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
26 PerGlyphInfo, 27 PerGlyphInfo,
27 const uint32_t* glyphIDs, 28 const uint32_t* glyphIDs,
28 uint32_t glyphIDsCount) const override; 29 uint32_t glyphIDsCount) const override;
29 SkStreamAsset* onOpenStream(int* ttcIndex) const override; 30 SkStreamAsset* onOpenStream(int* ttcIndex) const override;
30 void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override; 31 void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override;
31 32
32 int onCharsToGlyphs(const void* chars, Encoding encoding, 33 int onCharsToGlyphs(const void* chars, Encoding encoding,
33 uint16_t glyphs[], int glyphCount) const override; 34 uint16_t glyphs[], int glyphCount) const override;
34 int onCountGlyphs() const override; 35 int onCountGlyphs() const override;
35 int onGetUPEM() const override; 36 int onGetUPEM() const override;
36 37
37 void onGetFamilyName(SkString* familyName) const override; 38 void onGetFamilyName(SkString* familyName) const override;
38 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override; 39 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
39 40
40 int onGetTableTags(SkFontTableTag tags[]) const override; 41 int onGetTableTags(SkFontTableTag tags[]) const override;
41 size_t onGetTableData(SkFontTableTag, size_t offset, 42 size_t onGetTableData(SkFontTableTag, size_t offset,
42 size_t length, void* data) const override; 43 size_t length, void* data) const override;
43 44
44 private: 45 private:
45 sk_sp<SkTypeface> fProxy; 46 SkTypeface* fProxy;
46 SkPaint fPaint; 47 SkPaint fPaint;
47 }; 48 };
48 49
49 #endif 50 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698