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

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

Issue 62123: Skia: remove fHeight (Closed)
Patch Set: Created 11 years, 8 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 | « DEPS ('k') | skia/ports/SkFontHost_FreeType.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 (C) 2006 The Android Open Source Project 2 * Copyright (C) 2006 The Android Open Source Project
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at 6 * You may obtain a copy of the License at
7 * 7 *
8 * http://www.apache.org/licenses/LICENSE-2.0 8 * http://www.apache.org/licenses/LICENSE-2.0
9 * 9 *
10 * Unless required by applicable law or agreed to in writing, software 10 * Unless required by applicable law or agreed to in writing, software
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 } 609 }
610 610
611 void setTextEncoding(TextEncoding encoding); 611 void setTextEncoding(TextEncoding encoding);
612 612
613 struct FontMetrics { 613 struct FontMetrics {
614 SkScalar fTop; //!< The greatest distance above the baseline fo r any glyph (will be <= 0) 614 SkScalar fTop; //!< The greatest distance above the baseline fo r any glyph (will be <= 0)
615 SkScalar fAscent; //!< The recommended distance above the baseline (will be <= 0) 615 SkScalar fAscent; //!< The recommended distance above the baseline (will be <= 0)
616 SkScalar fDescent; //!< The recommended distance below the baseline (will be >= 0) 616 SkScalar fDescent; //!< The recommended distance below the baseline (will be >= 0)
617 SkScalar fBottom; //!< The greatest distance below the baseline fo r any glyph (will be >= 0) 617 SkScalar fBottom; //!< The greatest distance below the baseline fo r any glyph (will be >= 0)
618 SkScalar fLeading; //!< The recommended distance to add between lin es of text (will be >= 0) 618 SkScalar fLeading; //!< The recommended distance to add between lin es of text (will be >= 0)
619 SkScalar fHeight; //!< the vertical distance between two consecuti ve baselines (>= 0)
620 SkScalar fAvgCharWidth; //!< the average charactor width (>= 0) 619 SkScalar fAvgCharWidth; //!< the average charactor width (>= 0)
621 SkScalar fXMin; //!< The minimum bounding box x value for all gl yphs 620 SkScalar fXMin; //!< The minimum bounding box x value for all gl yphs
622 SkScalar fXMax; //!< The maximum bounding box x value for all gl yphs 621 SkScalar fXMax; //!< The maximum bounding box x value for all gl yphs
623 SkScalar fXHeight; //!< the height of an 'x' in px, or 0 if no 'x' in face 622 SkScalar fXHeight; //!< the height of an 'x' in px, or 0 if no 'x' in face
624 623
625 // VDMX values are exact ascent and descent values for scalable fonts at 624 // VDMX values are exact ascent and descent values for scalable fonts at
626 // a certain pixel size. 625 // a certain pixel size.
627 bool fVDMXMetricsValid; //!< If true, the following members are valid 626 bool fVDMXMetricsValid; //!< If true, the following members are valid
628 unsigned fVDMXAscent; 627 unsigned fVDMXAscent;
629 unsigned fVDMXDescent; 628 unsigned fVDMXDescent;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 822
824 typedef SkPathEffect INHERITED; 823 typedef SkPathEffect INHERITED;
825 824
826 // illegal 825 // illegal
827 SkStrokePathEffect(const SkStrokePathEffect&); 826 SkStrokePathEffect(const SkStrokePathEffect&);
828 SkStrokePathEffect& operator=(const SkStrokePathEffect&); 827 SkStrokePathEffect& operator=(const SkStrokePathEffect&);
829 }; 828 };
830 829
831 #endif 830 #endif
832 831
OLDNEW
« no previous file with comments | « DEPS ('k') | skia/ports/SkFontHost_FreeType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698