| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 int emphasisMarkAscent(const AtomicString&) const; | 120 int emphasisMarkAscent(const AtomicString&) const; |
| 121 int emphasisMarkDescent(const AtomicString&) const; | 121 int emphasisMarkDescent(const AtomicString&) const; |
| 122 int emphasisMarkHeight(const AtomicString&) const; | 122 int emphasisMarkHeight(const AtomicString&) const; |
| 123 | 123 |
| 124 const SimpleFontData* primaryFont() const; | 124 const SimpleFontData* primaryFont() const; |
| 125 const FontData* fontDataAt(unsigned) const; | 125 const FontData* fontDataAt(unsigned) const; |
| 126 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria
nt variant = AutoVariant) const | 126 inline GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVaria
nt variant = AutoVariant) const |
| 127 { | 127 { |
| 128 return glyphDataAndPageForCharacter(c, mirror, variant).first; | 128 return glyphDataAndPageForCharacter(c, mirror, variant).first; |
| 129 } | 129 } |
| 130 #if OS(MACOSX) | |
| 131 const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, si
ze_t length, FontDataVariant) const; | |
| 132 #endif | |
| 133 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool
mirror, FontDataVariant = AutoVariant) const; | 130 std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool
mirror, FontDataVariant = AutoVariant) const; |
| 134 bool primaryFontHasGlyphForCharacter(UChar32) const; | 131 bool primaryFontHasGlyphForCharacter(UChar32) const; |
| 135 | 132 |
| 136 CodePath codePath(const TextRun&) const; | 133 CodePath codePath(const TextRun&) const; |
| 137 | 134 |
| 138 private: | 135 private: |
| 139 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; | 136 enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis }; |
| 140 | 137 |
| 141 // Returns the initial in-stream advance. | 138 // Returns the initial in-stream advance. |
| 142 float getGlyphsAndAdvancesForSimpleText(const TextRunPaintInfo&, GlyphBuffer
&, ForTextEmphasisOrNot = NotForTextEmphasis) const; | 139 float getGlyphsAndAdvancesForSimpleText(const TextRunPaintInfo&, GlyphBuffer
&, ForTextEmphasisOrNot = NotForTextEmphasis) const; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 { | 220 { |
| 224 if (!tabSize) | 221 if (!tabSize) |
| 225 return fontDescription().letterSpacing(); | 222 return fontDescription().letterSpacing(); |
| 226 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS
pacing(); | 223 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS
pacing(); |
| 227 return tabWidth - fmodf(position, tabWidth); | 224 return tabWidth - fmodf(position, tabWidth); |
| 228 } | 225 } |
| 229 | 226 |
| 230 } // namespace blink | 227 } // namespace blink |
| 231 | 228 |
| 232 #endif | 229 #endif |
| OLD | NEW |