| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 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, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume
d, glyphName); | 240 return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsume
d, glyphName); |
| 241 #endif | 241 #endif |
| 242 | 242 |
| 243 charsConsumed = run.length(); | 243 charsConsumed = run.length(); |
| 244 glyphName = ""; | 244 glyphName = ""; |
| 245 return width(run); | 245 return width(run); |
| 246 } | 246 } |
| 247 | 247 |
| 248 #if !OS(MACOSX) | 248 #if !OS(MACOSX) |
| 249 | 249 |
| 250 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const | 250 PassOwnPtr<TextLayout> Font::createLayoutForMacComplexText(const TextRun&, unsig
ned, float, bool) const |
| 251 { | 251 { |
| 252 ASSERT_NOT_REACHED(); |
| 252 return nullptr; | 253 return nullptr; |
| 253 } | 254 } |
| 254 | 255 |
| 255 void Font::deleteLayout(TextLayout*) | 256 void Font::deleteLayout(TextLayout*) |
| 256 { | 257 { |
| 257 } | 258 } |
| 258 | 259 |
| 259 float Font::width(TextLayout&, unsigned, unsigned, HashSet<const SimpleFontData*
>*) | 260 float Font::width(TextLayout&, unsigned, unsigned, HashSet<const SimpleFontData*
>*) |
| 260 { | 261 { |
| 261 ASSERT_NOT_REACHED(); | 262 ASSERT_NOT_REACHED(); |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 } | 690 } |
| 690 | 691 |
| 691 void Font::willUseFontData() const | 692 void Font::willUseFontData() const |
| 692 { | 693 { |
| 693 const FontFamily& family = fontDescription().family(); | 694 const FontFamily& family = fontDescription().family(); |
| 694 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami
lyIsEmpty()) | 695 if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.fami
lyIsEmpty()) |
| 695 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f
amily.family()); | 696 m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), f
amily.family()); |
| 696 } | 697 } |
| 697 | 698 |
| 698 } | 699 } |
| OLD | NEW |