OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2008, 2009, 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 | 94 |
95 if (xGlyph) | 95 if (xGlyph) |
96 m_avgCharWidth = widthForGlyph(xGlyph); | 96 m_avgCharWidth = widthForGlyph(xGlyph); |
97 } | 97 } |
98 } | 98 } |
99 } | 99 } |
100 | 100 |
101 void SimpleFontData::platformDestroy() | 101 void SimpleFontData::platformDestroy() |
102 { | 102 { |
103 delete m_smallCapsFontData; | 103 delete m_smallCapsFontData; |
| 104 m_smallCapsFontData = 0; |
104 } | 105 } |
105 | 106 |
106 SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDes
cription) const | 107 SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDes
cription) const |
107 { | 108 { |
108 if (!m_smallCapsFontData) { | 109 if (!m_smallCapsFontData) { |
109 const float smallCapsSize = lroundf(fontDescription.computedSize() * sma
llCapsFraction); | 110 const float smallCapsSize = lroundf(fontDescription.computedSize() * sma
llCapsFraction); |
110 m_smallCapsFontData = new SimpleFontData(FontPlatformData(m_font, smallC
apsSize)); | 111 m_smallCapsFontData = new SimpleFontData(FontPlatformData(m_font, smallC
apsSize)); |
111 } | 112 } |
112 | 113 |
113 return m_smallCapsFontData; | 114 return m_smallCapsFontData; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 | 153 |
153 m_font.setupPaint(&paint); | 154 m_font.setupPaint(&paint); |
154 | 155 |
155 paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); | 156 paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); |
156 SkScalar width = paint.measureText(&glyph, 2); | 157 SkScalar width = paint.measureText(&glyph, 2); |
157 | 158 |
158 return SkScalarToFloat(width); | 159 return SkScalarToFloat(width); |
159 } | 160 } |
160 | 161 |
161 } // namespace WebCore | 162 } // namespace WebCore |
OLD | NEW |