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

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

Issue 152073003: Adding code to calculate Underline Thickness from Font Metrics, this will be useful when Skia is us… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Comment fix and addition of underline position Created 6 years, 10 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 | « no previous file | 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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 SkScalar fAscent; //!< The recommended distance above the baseline (will be <= 0) 735 SkScalar fAscent; //!< The recommended distance above the baseline (will be <= 0)
736 SkScalar fDescent; //!< The recommended distance below the baseline (will be >= 0) 736 SkScalar fDescent; //!< The recommended distance below the baseline (will be >= 0)
737 SkScalar fBottom; //!< The greatest distance below the baseline fo r any glyph (will be >= 0) 737 SkScalar fBottom; //!< The greatest distance below the baseline fo r any glyph (will be >= 0)
738 SkScalar fLeading; //!< The recommended distance to add between lin es of text (will be >= 0) 738 SkScalar fLeading; //!< The recommended distance to add between lin es of text (will be >= 0)
739 SkScalar fAvgCharWidth; //!< the average charactor width (>= 0) 739 SkScalar fAvgCharWidth; //!< the average charactor width (>= 0)
740 SkScalar fMaxCharWidth; //!< the max charactor width (>= 0) 740 SkScalar fMaxCharWidth; //!< the max charactor width (>= 0)
741 SkScalar fXMin; //!< The minimum bounding box x value for all gl yphs 741 SkScalar fXMin; //!< The minimum bounding box x value for all gl yphs
742 SkScalar fXMax; //!< The maximum bounding box x value for all gl yphs 742 SkScalar fXMax; //!< The maximum bounding box x value for all gl yphs
743 SkScalar fXHeight; //!< The height of an 'x' in px, or 0 if no 'x' in face 743 SkScalar fXHeight; //!< The height of an 'x' in px, or 0 if no 'x' in face
744 SkScalar fCapHeight; //!< The cap height (> 0), or 0 if cannot be de termined. 744 SkScalar fCapHeight; //!< The cap height (> 0), or 0 if cannot be de termined.
745 SkScalar fUnderlineThickness; //!< underline thickness, or 0 if canno t be determined
reed1 2014/02/11 15:59:52 I suggest a bitfield at the beginning, with some b
h.joshi 2014/02/12 17:20:59 Added bitfield as per comments, pls check On 2014
746 SkScalar fUnderlinePosition; //!< underline position, or 0 if cannot be determined
745 }; 747 };
746 748
747 /** Return the recommend spacing between lines (which will be 749 /** Return the recommend spacing between lines (which will be
748 fDescent - fAscent + fLeading). 750 fDescent - fAscent + fLeading).
749 If metrics is not null, return in it the font metrics for the 751 If metrics is not null, return in it the font metrics for the
750 typeface/pointsize/etc. currently set in the paint. 752 typeface/pointsize/etc. currently set in the paint.
751 @param metrics If not null, returns the font metrics for the 753 @param metrics If not null, returns the font metrics for the
752 current typeface/pointsize/etc setting in this 754 current typeface/pointsize/etc setting in this
753 paint. 755 paint.
754 @param scale If not 0, return width as if the canvas were scaled 756 @param scale If not 0, return width as if the canvas were scaled
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 #ifdef SK_BUILD_FOR_ANDROID 1081 #ifdef SK_BUILD_FOR_ANDROID
1080 SkPaintOptionsAndroid fPaintOptionsAndroid; 1082 SkPaintOptionsAndroid fPaintOptionsAndroid;
1081 1083
1082 // In order for the == operator to work properly this must be the last field 1084 // In order for the == operator to work properly this must be the last field
1083 // in the struct so that we can do a memcmp to this field's offset. 1085 // in the struct so that we can do a memcmp to this field's offset.
1084 uint32_t fGenerationID; 1086 uint32_t fGenerationID;
1085 #endif 1087 #endif
1086 }; 1088 };
1087 1089
1088 #endif 1090 #endif
OLDNEW
« no previous file with comments | « no previous file | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698