src/fonts/SkGScalerContext.h - Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases.

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase Created 5 years, 11 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/fonts/SkFontMgr_indirect.cpp ('k') | src/fonts/SkGScalerContext.cpp » ('j') | no next file with comments »

OLD	NEW
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(SkTypeface* proxy, const SkPaint&);

17 virtual ~SkGTypeface();	17 virtual ~SkGTypeface();

18	18

19 SkTypeface* proxy() const { return fProxy; }	19 SkTypeface* proxy() const { return fProxy; }

20 const SkPaint& paint() const { return fPaint; }	20 const SkPaint& paint() const { return fPaint; }

21	21

22 protected:	22 protected:

23 virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK _OVERRIDE;	23 SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRID E;

24 virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;	24 void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;

25 virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(	25 virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(

26 SkAdvancedTypefaceMetrics::PerGlyphInfo,	26 SkAdvancedTypefaceMetrics::PerGlyphInfo,

27 const uint32_t* glyphIDs,	27 const uint32_t* glyphIDs,

28 uint32_t glyphIDsCount) const SK_OVERRIDE;	28 uint32_t glyphIDsCount) const SK_OVERRIDE;

29 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;	29 SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;

30 virtual void onGetFontDescriptor(SkFontDescriptor, bool isLocal) const SK_ OVERRIDE;	30 void onGetFontDescriptor(SkFontDescriptor, bool isLocal) const SK_OVERRIDE ;

31	31

32 virtual int onCharsToGlyphs(const void* chars, Encoding encoding,	32 virtual int onCharsToGlyphs(const void* chars, Encoding encoding,

33 uint16_t glyphs[], int glyphCount) const SK_OVER RIDE;	33 uint16_t glyphs[], int glyphCount) const SK_OVER RIDE;

34 virtual int onCountGlyphs() const SK_OVERRIDE;	34 int onCountGlyphs() const SK_OVERRIDE;

35 virtual int onGetUPEM() const SK_OVERRIDE;	35 int onGetUPEM() const SK_OVERRIDE;

36	36

37 virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;	37 void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;

38 virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_ OVERRIDE;	38 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE ;

39	39

40 virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;	40 int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;

41 virtual size_t onGetTableData(SkFontTableTag, size_t offset,	41 virtual size_t onGetTableData(SkFontTableTag, size_t offset,

42 size_t length, void* data) const SK_OVERRIDE;	42 size_t length, void* data) const SK_OVERRIDE;

43	43

44 private:	44 private:

45 SkTypeface* fProxy;	45 SkTypeface* fProxy;

46 SkPaint fPaint;	46 SkPaint fPaint;

47 };	47 };

48	48

49 #endif	49 #endif

OLD	NEW