summaryrefslogtreecommitdiffstats
path: root/skia/include
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 23:16:46 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 23:16:46 +0000
commitc8bdcb753bcbe960bc239419180d085534ef8432 (patch)
treeee4fe15caace7a6e8a893b5b52ec421fbcfc5269 /skia/include
parent9903c6cd6567c8a9e0227232a83387db6383ef9d (diff)
downloadchromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.zip
chromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.tar.gz
chromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.tar.bz2
Revert "Skia: remove fHeight"
This reverts r13300 and r13299. Something clearly went wrong with the layout tests that I didn't notice. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/include')
-rw-r--r--skia/include/SkPaint.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/skia/include/SkPaint.h b/skia/include/SkPaint.h
index d13d090..b871bda 100644
--- a/skia/include/SkPaint.h
+++ b/skia/include/SkPaint.h
@@ -616,6 +616,7 @@ public:
SkScalar fDescent; //!< The recommended distance below the baseline (will be >= 0)
SkScalar fBottom; //!< The greatest distance below the baseline for any glyph (will be >= 0)
SkScalar fLeading; //!< The recommended distance to add between lines of text (will be >= 0)
+ SkScalar fHeight; //!< the vertical distance between two consecutive baselines (>= 0)
SkScalar fAvgCharWidth; //!< the average charactor width (>= 0)
SkScalar fXMin; //!< The minimum bounding box x value for all glyphs
SkScalar fXMax; //!< The maximum bounding box x value for all glyphs