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

Side by Side Diff: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h

Issue 212763002: Revert of Remove unused FontPlatformDataHarfBuzz::emSizeInFontUnits (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.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, 2007, 2008, Google Inc. All rights reserved. 2 * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 // ------------------------------------------------------------------------- 87 // -------------------------------------------------------------------------
88 // Return Skia's unique id for this font. This encodes both the style and 88 // Return Skia's unique id for this font. This encodes both the style and
89 // the font's file name so refers to a single face. 89 // the font's file name so refers to a single face.
90 // ------------------------------------------------------------------------- 90 // -------------------------------------------------------------------------
91 SkFontID uniqueID() const; 91 SkFontID uniqueID() const;
92 SkTypeface* typeface() const { return m_typeface.get(); } 92 SkTypeface* typeface() const { return m_typeface.get(); }
93 93
94 unsigned hash() const; 94 unsigned hash() const;
95 float size() const { return m_textSize; } 95 float size() const { return m_textSize; }
96 int emSizeInFontUnits() const;
96 97
97 FontOrientation orientation() const { return m_orientation; } 98 FontOrientation orientation() const { return m_orientation; }
98 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; } 99 void setOrientation(FontOrientation orientation) { m_orientation = orientati on; }
99 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; } 100 void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }
100 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; } 101 void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheti cItalic; }
101 bool operator==(const FontPlatformData&) const; 102 bool operator==(const FontPlatformData&) const;
102 FontPlatformData& operator=(const FontPlatformData&); 103 FontPlatformData& operator=(const FontPlatformData&);
103 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; } 104 bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
104 105
105 #if ENABLE(OPENTYPE_VERTICAL) 106 #if ENABLE(OPENTYPE_VERTICAL)
(...skipping 19 matching lines...) Expand all
125 static void setAntiAlias(bool); 126 static void setAntiAlias(bool);
126 static void setSubpixelRendering(bool); 127 static void setSubpixelRendering(bool);
127 128
128 private: 129 private:
129 void getRenderStyleForStrike(const char*, int); 130 void getRenderStyleForStrike(const char*, int);
130 void querySystemForRenderStyle(bool useSkiaSubpixelPositioning); 131 void querySystemForRenderStyle(bool useSkiaSubpixelPositioning);
131 132
132 RefPtr<SkTypeface> m_typeface; 133 RefPtr<SkTypeface> m_typeface;
133 CString m_family; 134 CString m_family;
134 float m_textSize; 135 float m_textSize;
136 mutable int m_emSizeInFontUnits;
135 bool m_syntheticBold; 137 bool m_syntheticBold;
136 bool m_syntheticItalic; 138 bool m_syntheticItalic;
137 FontOrientation m_orientation; 139 FontOrientation m_orientation;
138 FontRenderStyle m_style; 140 FontRenderStyle m_style;
139 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace; 141 mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
140 bool m_isHashTableDeletedValue; 142 bool m_isHashTableDeletedValue;
141 }; 143 };
142 144
143 } // namespace WebCore 145 } // namespace WebCore
144 146
145 #endif // ifdef FontPlatformDataHarfBuzz_h 147 #endif // ifdef FontPlatformDataHarfBuzz_h
OLDNEW
« no previous file with comments | « no previous file | Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698