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

Side by Side Diff: include/core/SkPaint.h

Issue 23056005: Nobody defines SK_SUPPORT_HINTING_SCALE_FACTOR any more, so remove it. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: undo Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/core/SkPaint.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 2
3 /* 3 /*
4 * Copyright 2006 The Android Open Source Project 4 * Copyright 2006 The Android Open Source Project
5 * 5 *
6 * Use of this source code is governed by a BSD-style license that can be 6 * Use of this source code is governed by a BSD-style license that can be
7 * found in the LICENSE file. 7 * found in the LICENSE file.
8 */ 8 */
9 9
10 10
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 @return the paint's skew factor in X for drawing text. 710 @return the paint's skew factor in X for drawing text.
711 */ 711 */
712 SkScalar getTextSkewX() const { return fTextSkewX; } 712 SkScalar getTextSkewX() const { return fTextSkewX; }
713 713
714 /** Set the paint's horizontal skew factor for text. The default value 714 /** Set the paint's horizontal skew factor for text. The default value
715 is 0. For approximating oblique text, use values around -0.25. 715 is 0. For approximating oblique text, use values around -0.25.
716 @param skewX set the paint's skew factor in X for drawing text. 716 @param skewX set the paint's skew factor in X for drawing text.
717 */ 717 */
718 void setTextSkewX(SkScalar skewX); 718 void setTextSkewX(SkScalar skewX);
719 719
720 #ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
721 /** Return the paint's scale factor used for correctly rendering
722 glyphs in high DPI mode without text subpixel positioning.
723 @return the scale factor used for rendering glyphs in high DPI mode.
724 */
725 SkScalar getHintingScaleFactor() const { return fHintingScaleFactor; }
726
727 /** Set the paint's scale factor used for correctly rendering
728 glyphs in high DPI mode without text subpixel positioning.
729 @param the scale factor used for rendering glyphs in high DPI mode.
730 */
731 void setHintingScaleFactor(SkScalar hintingScaleFactor);
732 #endif
733
734 /** Describes how to interpret the text parameters that are passed to paint 720 /** Describes how to interpret the text parameters that are passed to paint
735 methods like measureText() and getTextWidths(). 721 methods like measureText() and getTextWidths().
736 */ 722 */
737 enum TextEncoding { 723 enum TextEncoding {
738 kUTF8_TextEncoding, //!< the text parameters are UTF8 724 kUTF8_TextEncoding, //!< the text parameters are UTF8
739 kUTF16_TextEncoding, //!< the text parameters are UTF16 725 kUTF16_TextEncoding, //!< the text parameters are UTF16
740 kUTF32_TextEncoding, //!< the text parameters are UTF32 726 kUTF32_TextEncoding, //!< the text parameters are UTF32
741 kGlyphID_TextEncoding //!< the text parameters are glyph indices 727 kGlyphID_TextEncoding //!< the text parameters are glyph indices
742 }; 728 };
743 729
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 return SetTextMatrix(matrix, fTextSize, fTextScaleX, fTextSkewX); 977 return SetTextMatrix(matrix, fTextSize, fTextScaleX, fTextSkewX);
992 } 978 }
993 979
994 SkDEVCODE(void toString(SkString*) const;) 980 SkDEVCODE(void toString(SkString*) const;)
995 981
996 private: 982 private:
997 SkTypeface* fTypeface; 983 SkTypeface* fTypeface;
998 SkScalar fTextSize; 984 SkScalar fTextSize;
999 SkScalar fTextScaleX; 985 SkScalar fTextScaleX;
1000 SkScalar fTextSkewX; 986 SkScalar fTextSkewX;
1001 #ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
1002 SkScalar fHintingScaleFactor;
1003 #endif
1004 987
1005 SkPathEffect* fPathEffect; 988 SkPathEffect* fPathEffect;
1006 SkShader* fShader; 989 SkShader* fShader;
1007 SkXfermode* fXfermode; 990 SkXfermode* fXfermode;
1008 SkMaskFilter* fMaskFilter; 991 SkMaskFilter* fMaskFilter;
1009 SkColorFilter* fColorFilter; 992 SkColorFilter* fColorFilter;
1010 SkRasterizer* fRasterizer; 993 SkRasterizer* fRasterizer;
1011 SkDrawLooper* fLooper; 994 SkDrawLooper* fLooper;
1012 SkImageFilter* fImageFilter; 995 SkImageFilter* fImageFilter;
1013 SkAnnotation* fAnnotation; 996 SkAnnotation* fAnnotation;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 #ifdef SK_BUILD_FOR_ANDROID 1079 #ifdef SK_BUILD_FOR_ANDROID
1097 SkPaintOptionsAndroid fPaintOptionsAndroid; 1080 SkPaintOptionsAndroid fPaintOptionsAndroid;
1098 1081
1099 // In order for the == operator to work properly this must be the last field 1082 // In order for the == operator to work properly this must be the last field
1100 // in the struct so that we can do a memcmp to this field's offset. 1083 // in the struct so that we can do a memcmp to this field's offset.
1101 uint32_t fGenerationID; 1084 uint32_t fGenerationID;
1102 #endif 1085 #endif
1103 }; 1086 };
1104 1087
1105 #endif 1088 #endif
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698