| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 | 225 |
| 226 if (treatAsZeroWidthSpace(character)) | 226 if (treatAsZeroWidthSpace(character)) |
| 227 return zeroWidthSpace; | 227 return zeroWidthSpace; |
| 228 | 228 |
| 229 return character; | 229 return character; |
| 230 } | 230 } |
| 231 | 231 |
| 232 static String normalizeSpaces(const LChar*, unsigned length); | 232 static String normalizeSpaces(const LChar*, unsigned length); |
| 233 static String normalizeSpaces(const UChar*, unsigned length); | 233 static String normalizeSpaces(const UChar*, unsigned length); |
| 234 | 234 |
| 235 bool needsTranscoding() const { return m_needsTranscoding; } | |
| 236 FontFallbackList* fontList() const { return m_fontFallbackList.get(); } | 235 FontFallbackList* fontList() const { return m_fontFallbackList.get(); } |
| 237 | 236 |
| 238 void willUseFontData() const; | 237 void willUseFontData() const; |
| 239 | 238 |
| 240 private: | 239 private: |
| 241 bool loadingCustomFonts() const | 240 bool loadingCustomFonts() const |
| 242 { | 241 { |
| 243 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); | 242 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); |
| 244 } | 243 } |
| 245 | 244 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 return features; | 284 return features; |
| 286 } | 285 } |
| 287 | 286 |
| 288 static TypesettingFeatures s_defaultTypesettingFeatures; | 287 static TypesettingFeatures s_defaultTypesettingFeatures; |
| 289 | 288 |
| 290 FontDescription m_fontDescription; | 289 FontDescription m_fontDescription; |
| 291 mutable RefPtr<FontFallbackList> m_fontFallbackList; | 290 mutable RefPtr<FontFallbackList> m_fontFallbackList; |
| 292 float m_letterSpacing; | 291 float m_letterSpacing; |
| 293 float m_wordSpacing; | 292 float m_wordSpacing; |
| 294 bool m_isPlatformFont; | 293 bool m_isPlatformFont; |
| 295 bool m_needsTranscoding; | |
| 296 mutable unsigned m_typesettingFeatures : 2; // (TypesettingFeatures) Caches
values computed from m_fontDescription. | 294 mutable unsigned m_typesettingFeatures : 2; // (TypesettingFeatures) Caches
values computed from m_fontDescription. |
| 297 }; | 295 }; |
| 298 | 296 |
| 299 inline Font::~Font() | 297 inline Font::~Font() |
| 300 { | 298 { |
| 301 } | 299 } |
| 302 | 300 |
| 303 inline const SimpleFontData* Font::primaryFont() const | 301 inline const SimpleFontData* Font::primaryFont() const |
| 304 { | 302 { |
| 305 ASSERT(m_fontFallbackList); | 303 ASSERT(m_fontFallbackList); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 335 | 333 |
| 336 namespace WTF { | 334 namespace WTF { |
| 337 | 335 |
| 338 template <> struct OwnedPtrDeleter<WebCore::TextLayout> { | 336 template <> struct OwnedPtrDeleter<WebCore::TextLayout> { |
| 339 static void deletePtr(WebCore::TextLayout*); | 337 static void deletePtr(WebCore::TextLayout*); |
| 340 }; | 338 }; |
| 341 | 339 |
| 342 } | 340 } |
| 343 | 341 |
| 344 #endif | 342 #endif |
| OLD | NEW |