| 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  501             if (data.glyph != verticalRightData.glyph) |  501             if (data.glyph != verticalRightData.glyph) | 
|  502                 return data; |  502                 return data; | 
|  503             // The glyphs are identical, meaning that we should just use the hor
     izontal glyph. |  503             // The glyphs are identical, meaning that we should just use the hor
     izontal glyph. | 
|  504             if (verticalRightData.fontData) |  504             if (verticalRightData.fontData) | 
|  505                 return verticalRightData; |  505                 return verticalRightData; | 
|  506         } |  506         } | 
|  507     } |  507     } | 
|  508     return data; |  508     return data; | 
|  509 } |  509 } | 
|  510  |  510  | 
|  511 PassRefPtr<FontFallbackIterator> Font::createFontFallbackIterator( |  511 PassRefPtr<FontFallbackIterator> Font::createFontFallbackIterator() const | 
|  512     FontFallbackPriority fallbackPriority) const |  | 
|  513 { |  512 { | 
|  514     return FontFallbackIterator::create(m_fontDescription, |  513     return FontFallbackIterator::create(m_fontDescription, m_fontFallbackList); | 
|  515         m_fontFallbackList, |  | 
|  516         fallbackPriority); |  | 
|  517 } |  514 } | 
|  518  |  515  | 
|  519 GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpa
     ce, FontDataVariant variant) const |  516 GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpa
     ce, FontDataVariant variant) const | 
|  520 { |  517 { | 
|  521     ASSERT(isMainThread()); |  518     ASSERT(isMainThread()); | 
|  522  |  519  | 
|  523     if (variant == AutoVariant) { |  520     if (variant == AutoVariant) { | 
|  524         if (m_fontDescription.variant() == FontVariantSmallCaps) { |  521         if (m_fontDescription.variant() == FontVariantSmallCaps) { | 
|  525             bool includeDefault = false; |  522             bool includeDefault = false; | 
|  526             UChar32 upperC = toUpper(c, m_fontDescription.locale(includeDefault)
     ); |  523             UChar32 upperC = toUpper(c, m_fontDescription.locale(includeDefault)
     ); | 
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  827 { |  824 { | 
|  828     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); |  825     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); | 
|  829 } |  826 } | 
|  830  |  827  | 
|  831 bool Font::isFallbackValid() const |  828 bool Font::isFallbackValid() const | 
|  832 { |  829 { | 
|  833     return !m_fontFallbackList || m_fontFallbackList->isValid(); |  830     return !m_fontFallbackList || m_fontFallbackList->isValid(); | 
|  834 } |  831 } | 
|  835  |  832  | 
|  836 } // namespace blink |  833 } // namespace blink | 
| OLD | NEW |