| 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 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. | 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. |
| 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 variant = SmallCapsVariant; | 433 variant = SmallCapsVariant; |
| 434 } else { | 434 } else { |
| 435 variant = NormalVariant; | 435 variant = NormalVariant; |
| 436 } | 436 } |
| 437 } else { | 437 } else { |
| 438 variant = NormalVariant; | 438 variant = NormalVariant; |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 if (normalizeSpace && Character::isNormalizedCanvasSpaceCharacter(c)) | 442 if (normalizeSpace && Character::isNormalizedCanvasSpaceCharacter(c)) |
| 443 c = space; | 443 c = spaceCharacter; |
| 444 | 444 |
| 445 if (mirror) | 445 if (mirror) |
| 446 c = mirroredChar(c); | 446 c = mirroredChar(c); |
| 447 | 447 |
| 448 unsigned pageNumber = (c / GlyphPage::size); | 448 unsigned pageNumber = (c / GlyphPage::size); |
| 449 | 449 |
| 450 GlyphPageTreeNodeBase* node = m_fontFallbackList->getPageNode(pageNumber); | 450 GlyphPageTreeNodeBase* node = m_fontFallbackList->getPageNode(pageNumber); |
| 451 if (!node) { | 451 if (!node) { |
| 452 node = GlyphPageTreeNode::getRootChild(fontDataAt(0), pageNumber); | 452 node = GlyphPageTreeNode::getRootChild(fontDataAt(0), pageNumber); |
| 453 m_fontFallbackList->setPageNode(pageNumber, node); | 453 m_fontFallbackList->setPageNode(pageNumber, node); |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 { | 882 { |
| 883 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); | 883 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); |
| 884 } | 884 } |
| 885 | 885 |
| 886 bool Font::isFallbackValid() const | 886 bool Font::isFallbackValid() const |
| 887 { | 887 { |
| 888 return !m_fontFallbackList || m_fontFallbackList->isValid(); | 888 return !m_fontFallbackList || m_fontFallbackList->isValid(); |
| 889 } | 889 } |
| 890 | 890 |
| 891 } // namespace blink | 891 } // namespace blink |
| OLD | NEW |