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

Side by Side Diff: src/ports/SkScalerContext_win_dw.h

Issue 370463002: Remove vertical/horizontal metrics selection. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix Mac. Created 6 years, 5 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/SkFontHost_win.cpp ('k') | src/ports/SkScalerContext_win_dw.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 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
(...skipping 12 matching lines...) Expand all
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 virtual unsigned generateGlyphCount() SK_OVERRIDE;
28 virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; 28 virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
29 virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; 29 virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
30 virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; 30 virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
31 virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE; 31 virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
32 virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; 32 virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
33 virtual void generateFontMetrics(SkPaint::FontMetrics* mX, 33 virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
34 SkPaint::FontMetrics* mY) SK_OVERRIDE;
35 34
36 private: 35 private:
37 const void* drawDWMask(const SkGlyph& glyph); 36 const void* drawDWMask(const SkGlyph& glyph);
38 37
39 SkTDArray<uint8_t> fBits; 38 SkTDArray<uint8_t> fBits;
40 /** The total matrix without the text height scale. */ 39 /** The total matrix without the text height scale. */
41 SkMatrix fSkXform; 40 SkMatrix fSkXform;
42 /** The total matrix without the text height scale. */ 41 /** The total matrix without the text height scale. */
43 DWRITE_MATRIX fXform; 42 DWRITE_MATRIX fXform;
44 /** The non-rotational part of total matrix without the text height scale. 43 /** The non-rotational part of total matrix without the text height scale.
45 * This is used to find the magnitude of gdi compatible advances. 44 * This is used to find the magnitude of gdi compatible advances.
46 */ 45 */
47 DWRITE_MATRIX fGsA; 46 DWRITE_MATRIX fGsA;
48 /** The inverse of the rotational part of the total matrix. 47 /** The inverse of the rotational part of the total matrix.
49 * This is used to find the direction of gdi compatible advances. 48 * This is used to find the direction of gdi compatible advances.
50 */ 49 */
51 SkMatrix fG_inv; 50 SkMatrix fG_inv;
52 /** The text size to render with. */ 51 /** The text size to render with. */
53 SkScalar fTextSizeRender; 52 SkScalar fTextSizeRender;
54 /** The text size to measure with. */ 53 /** The text size to measure with. */
55 SkScalar fTextSizeMeasure; 54 SkScalar fTextSizeMeasure;
56 SkAutoTUnref<DWriteFontTypeface> fTypeface; 55 SkAutoTUnref<DWriteFontTypeface> fTypeface;
57 int fGlyphCount; 56 int fGlyphCount;
58 DWRITE_RENDERING_MODE fRenderingMode; 57 DWRITE_RENDERING_MODE fRenderingMode;
59 DWRITE_TEXTURE_TYPE fTextureType; 58 DWRITE_TEXTURE_TYPE fTextureType;
60 DWRITE_MEASURING_MODE fMeasuringMode; 59 DWRITE_MEASURING_MODE fMeasuringMode;
61 }; 60 };
62 61
63 #endif 62 #endif
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_win.cpp ('k') | src/ports/SkScalerContext_win_dw.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698