diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp index deac1b6..74b7ec1 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/FontFastPath.cpp @@ -24,6 +24,7 @@ #include "CharacterNames.h" #include "FontCache.h" +#include "FontFallbackList.h" #include "FloatRect.h" #include "GlyphBuffer.h" #include "GlyphPageTreeNode.h" @@ -57,13 +58,13 @@ GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, bool forceSmallCap unsigned pageNumber = (c / GlyphPage::size); - GlyphPageTreeNode* node = pageNumber ? m_pages.get(pageNumber) : m_pageZero; + GlyphPageTreeNode* node = pageNumber ? m_fontList->m_pages.get(pageNumber) : m_fontList->m_pageZero; if (!node) { node = GlyphPageTreeNode::getRootChild(fontDataAt(0), pageNumber); if (pageNumber) - m_pages.set(pageNumber, node); + m_fontList->m_pages.set(pageNumber, node); else - m_pageZero = node; + m_fontList->m_pageZero = node; } GlyphPage* page; @@ -82,9 +83,9 @@ GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, bool forceSmallCap // Proceed with the fallback list. node = node->getChild(fontDataAt(node->level()), pageNumber); if (pageNumber) - m_pages.set(pageNumber, node); + m_fontList->m_pages.set(pageNumber, node); else - m_pageZero = node; + m_fontList->m_pageZero = node; } } else { while (true) { @@ -118,9 +119,9 @@ GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, bool forceSmallCap // Proceed with the fallback list. node = node->getChild(fontDataAt(node->level()), pageNumber); if (pageNumber) - m_pages.set(pageNumber, node); + m_fontList->m_pages.set(pageNumber, node); else - m_pageZero = node; + m_fontList->m_pageZero = node; } } |