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

Side by Side Diff: src/ports/SkScalerContext_win_dw.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/ports/SkRemotableFontMgr_win_dw.cpp ('k') | src/ports/SkTypeface_win_dw.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2014 Google Inc.	2 * Copyright 2014 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 SkScalarContext_win_dw_DEFINED	8 #ifndef SkScalarContext_win_dw_DEFINED

9 #define SkScalarContext_win_dw_DEFINED	9 #define SkScalarContext_win_dw_DEFINED

10	10

11 #include "SkScalar.h"	11 #include "SkScalar.h"

12 #include "SkScalerContext.h"	12 #include "SkScalerContext.h"

13 #include "SkTypeface_win_dw.h"	13 #include "SkTypeface_win_dw.h"

14 #include "SkTypes.h"	14 #include "SkTypes.h"

15	15

16 #include <dwrite.h>	16 #include <dwrite.h>

17	17

18 struct SkGlyph;	18 struct SkGlyph;

19 class SkDescriptor;	19 class SkDescriptor;

20	20

21 class SkScalerContext_DW : public SkScalerContext {	21 class SkScalerContext_DW : public SkScalerContext {

22 public:	22 public:

23 SkScalerContext_DW(DWriteFontTypeface, const SkDescriptor desc);	23 SkScalerContext_DW(DWriteFontTypeface, const SkDescriptor desc);

24 virtual ~SkScalerContext_DW();	24 virtual ~SkScalerContext_DW();

25	25

26 protected:	26 protected:

27 virtual unsigned generateGlyphCount() SK_OVERRIDE;	27 unsigned generateGlyphCount() SK_OVERRIDE;

28 virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;	28 uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;

29 virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;	29 void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;

30 virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;	30 void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;

31 virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;	31 void generateImage(const SkGlyph& glyph) SK_OVERRIDE;

32 virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;	32 void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;

33 virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;	33 void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;

34	34

35 private:	35 private:

36 const void* drawDWMask(const SkGlyph& glyph,	36 const void* drawDWMask(const SkGlyph& glyph,

37 DWRITE_RENDERING_MODE renderingMode,	37 DWRITE_RENDERING_MODE renderingMode,

38 DWRITE_TEXTURE_TYPE textureType);	38 DWRITE_TEXTURE_TYPE textureType);

39	39

40 HRESULT getBoundingBox(SkGlyph* glyph,	40 HRESULT getBoundingBox(SkGlyph* glyph,

41 DWRITE_RENDERING_MODE renderingMode,	41 DWRITE_RENDERING_MODE renderingMode,

42 DWRITE_TEXTURE_TYPE textureType,	42 DWRITE_TEXTURE_TYPE textureType,

43 RECT* bbox);	43 RECT* bbox);

(...skipping 16 matching lines...) Expand all Loading...
60 /** The text size to measure with. */	60 /** The text size to measure with. */

61 SkScalar fTextSizeMeasure;	61 SkScalar fTextSizeMeasure;

62 SkAutoTUnref<DWriteFontTypeface> fTypeface;	62 SkAutoTUnref<DWriteFontTypeface> fTypeface;

63 int fGlyphCount;	63 int fGlyphCount;

64 DWRITE_RENDERING_MODE fRenderingMode;	64 DWRITE_RENDERING_MODE fRenderingMode;

65 DWRITE_TEXTURE_TYPE fTextureType;	65 DWRITE_TEXTURE_TYPE fTextureType;

66 DWRITE_MEASURING_MODE fMeasuringMode;	66 DWRITE_MEASURING_MODE fMeasuringMode;

67 };	67 };

68	68

69 #endif	69 #endif

OLD	NEW