| OLD | NEW |
| 1 /** | 1 /** |
| 2 * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Holger Hans Peter Freyther | 3 * Copyright (C) 2008 Holger Hans Peter Freyther |
| 4 * Copyright (C) 2009 Torch Mobile, Inc. | 4 * Copyright (C) 2009 Torch Mobile, Inc. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| 11 * This library is distributed in the hope that it will be useful, | 11 * This library is distributed in the hope that it will be useful, |
| 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 * Library General Public License for more details. | 14 * Library General Public License for more details. |
| 15 * | 15 * |
| 16 * You should have received a copy of the GNU Library General Public License | 16 * You should have received a copy of the GNU Library General Public License |
| 17 * along with this library; see the file COPYING.LIB. If not, write to | 17 * along with this library; see the file COPYING.LIB. If not, write to |
| 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 19 * Boston, MA 02110-1301, USA. | 19 * Boston, MA 02110-1301, USA. |
| 20 * | 20 * |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include "config.h" | 23 #include "config.h" |
| 24 #include "core/platform/graphics/Font.h" | 24 #include "platform/fonts/Font.h" |
| 25 | 25 |
| 26 #include "core/platform/graphics/FontCache.h" | |
| 27 #include "core/platform/graphics/FontFallbackList.h" | |
| 28 #include "core/platform/graphics/GlyphPageTreeNode.h" | |
| 29 #include "core/platform/graphics/SimpleFontData.h" | |
| 30 #include "core/platform/graphics/WidthIterator.h" | |
| 31 #include "platform/LayoutUnit.h" | 26 #include "platform/LayoutUnit.h" |
| 27 #include "platform/fonts/FontCache.h" |
| 28 #include "platform/fonts/FontFallbackList.h" |
| 29 #include "platform/fonts/GlyphPageTreeNode.h" |
| 30 #include "platform/fonts/SimpleFontData.h" |
| 31 #include "platform/fonts/WidthIterator.h" |
| 32 #include "platform/fonts/GlyphBuffer.h" | 32 #include "platform/fonts/GlyphBuffer.h" |
| 33 #include "platform/geometry/FloatRect.h" | 33 #include "platform/geometry/FloatRect.h" |
| 34 #include "platform/graphics/TextRun.h" | 34 #include "platform/graphics/TextRun.h" |
| 35 #include "wtf/MainThread.h" | 35 #include "wtf/MainThread.h" |
| 36 #include "wtf/MathExtras.h" | 36 #include "wtf/MathExtras.h" |
| 37 #include "wtf/unicode/CharacterNames.h" | 37 #include "wtf/unicode/CharacterNames.h" |
| 38 #include "wtf/unicode/Unicode.h" | 38 #include "wtf/unicode/Unicode.h" |
| 39 | 39 |
| 40 using namespace WTF; | 40 using namespace WTF; |
| 41 using namespace Unicode; | 41 using namespace Unicode; |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 // System fallback is character-dependent. When we get here, we | 271 // System fallback is character-dependent. When we get here, we |
| 272 // know that the character in question isn't in the system fallback | 272 // know that the character in question isn't in the system fallback |
| 273 // font's glyph page. Try to lazily create it here. | 273 // font's glyph page. Try to lazily create it here. |
| 274 | 274 |
| 275 // FIXME: Unclear if this should normalizeSpaces above 0xFFFF. | 275 // FIXME: Unclear if this should normalizeSpaces above 0xFFFF. |
| 276 // Doing so changes fast/text/international/plane2-diffs.html | 276 // Doing so changes fast/text/international/plane2-diffs.html |
| 277 UChar32 characterToRender = c; | 277 UChar32 characterToRender = c; |
| 278 if (characterToRender <= 0xFFFF) | 278 if (characterToRender <= 0xFFFF) |
| 279 characterToRender = Font::normalizeSpaces(characterToRender); | 279 characterToRender = Font::normalizeSpaces(characterToRender); |
| 280 const SimpleFontData* fontDataToSubstitute = fontDataAt(0)->fontDataForChara
cter(characterToRender); | 280 const SimpleFontData* fontDataToSubstitute = fontDataAt(0)->fontDataForChara
cter(characterToRender); |
| 281 RefPtr<SimpleFontData> characterFontData = fontCache()->platformFallbackForC
haracter(m_fontDescription, characterToRender, fontDataToSubstitute, isPlatformF
ont()); | 281 RefPtr<SimpleFontData> characterFontData = FontCache::fontCache()->platformF
allbackForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute,
isPlatformFont()); |
| 282 if (characterFontData) { | 282 if (characterFontData) { |
| 283 if (characterFontData->platformData().orientation() == Vertical && !char
acterFontData->hasVerticalGlyphs() && isCJKIdeographOrSymbol(c)) | 283 if (characterFontData->platformData().orientation() == Vertical && !char
acterFontData->hasVerticalGlyphs() && isCJKIdeographOrSymbol(c)) |
| 284 variant = BrokenIdeographVariant; | 284 variant = BrokenIdeographVariant; |
| 285 if (variant != NormalVariant) | 285 if (variant != NormalVariant) |
| 286 characterFontData = characterFontData->variantFontData(m_fontDescrip
tion, variant); | 286 characterFontData = characterFontData->variantFontData(m_fontDescrip
tion, variant); |
| 287 } | 287 } |
| 288 if (characterFontData) { | 288 if (characterFontData) { |
| 289 // Got the fallback glyph and font. | 289 // Got the fallback glyph and font. |
| 290 GlyphPage* fallbackPage = GlyphPageTreeNode::getRootChild(characterFontD
ata.get(), pageNumber)->page(); | 290 GlyphPage* fallbackPage = GlyphPageTreeNode::getRootChild(characterFontD
ata.get(), pageNumber)->page(); |
| 291 GlyphData data = fallbackPage && fallbackPage->fontDataForCharacter(c) ?
fallbackPage->glyphDataForCharacter(c) : characterFontData->missingGlyphData(); | 291 GlyphData data = fallbackPage && fallbackPage->fontDataForCharacter(c) ?
fallbackPage->glyphDataForCharacter(c) : characterFontData->missingGlyphData(); |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 612 if (delta <= 0) | 612 if (delta <= 0) |
| 613 break; | 613 break; |
| 614 } | 614 } |
| 615 } | 615 } |
| 616 } | 616 } |
| 617 | 617 |
| 618 return offset; | 618 return offset; |
| 619 } | 619 } |
| 620 | 620 |
| 621 } | 621 } |
| OLD | NEW |