| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2008 Holger Hans Peter Freyther | 6 * Copyright (C) 2008 Holger Hans Peter Freyther |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 int emphasisMarkAscent(const AtomicString&) const; | 115 int emphasisMarkAscent(const AtomicString&) const; |
| 116 int emphasisMarkDescent(const AtomicString&) const; | 116 int emphasisMarkDescent(const AtomicString&) const; |
| 117 int emphasisMarkHeight(const AtomicString&) const; | 117 int emphasisMarkHeight(const AtomicString&) const; |
| 118 | 118 |
| 119 const SimpleFontData* primaryFont() const; | 119 const SimpleFontData* primaryFont() const; |
| 120 const FontData* fontDataAt(unsigned) const; | 120 const FontData* fontDataAt(unsigned) const; |
| 121 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria
nt variant = AutoVariant) const | 121 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria
nt variant = AutoVariant) const |
| 122 { | 122 { |
| 123 return glyphDataAndPageForCharacter(c, mirror, variant).first; | 123 return glyphDataAndPageForCharacter(c, mirror, variant).first; |
| 124 } | 124 } |
| 125 #if OS(MACOSX) | |
| 126 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si
ze_t length, FontDataVariant) const; | |
| 127 #endif | |
| 128 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool
mirror, FontDataVariant = AutoVariant) const; | 125 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool
mirror, FontDataVariant = AutoVariant) const; |
| 129 bool primaryFontHasGlyphForCharacter(UChar32) const; | 126 bool primaryFontHasGlyphForCharacter(UChar32) const; |
| 130 | 127 |
| 131 CodePath codePath(const TextRun&) const; | 128 CodePath codePath(const TextRun&) const; |
| 132 | 129 |
| 133 private: | 130 private: |
| 134 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; | 131 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; |
| 135 | 132 |
| 136 // Returns the initial in-stream advance. | 133 // Returns the initial in-stream advance. |
| 137 float getGlyphsAndAdvancesForSimpleText(const TextRun&, int from, int to, Gl
yphBuffer&, ForTextEmphasisOrNot = NotForTextEmphasis) const; | 134 float getGlyphsAndAdvancesForSimpleText(const TextRun&, int from, int to, Gl
yphBuffer&, ForTextEmphasisOrNot = NotForTextEmphasis) const; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 { | 212 { |
| 216 if (!tabSize) | 213 if (!tabSize) |
| 217 return fontDescription().letterSpacing(); | 214 return fontDescription().letterSpacing(); |
| 218 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS
pacing(); | 215 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS
pacing(); |
| 219 return tabWidth - fmodf(position, tabWidth); | 216 return tabWidth - fmodf(position, tabWidth); |
| 220 } | 217 } |
| 221 | 218 |
| 222 } | 219 } |
| 223 | 220 |
| 224 #endif | 221 #endif |
| OLD | NEW |