| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 3 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 | 22 |
| 23 #if ENABLE(SVG_FONTS) | 23 #if ENABLE(SVG_FONTS) |
| 24 #include "core/rendering/svg/SVGTextRunRenderingContext.h" | 24 #include "core/rendering/svg/SVGTextRunRenderingContext.h" |
| 25 | 25 |
| 26 #include "SVGNames.h" | 26 #include "SVGNames.h" |
| 27 #include "core/platform/graphics/Font.h" | 27 #include "core/platform/graphics/Font.h" |
| 28 #include "core/platform/graphics/GlyphBuffer.h" | |
| 29 #include "core/platform/graphics/GraphicsContext.h" | 28 #include "core/platform/graphics/GraphicsContext.h" |
| 30 #include "core/platform/graphics/WidthIterator.h" | 29 #include "core/platform/graphics/WidthIterator.h" |
| 31 #include "core/rendering/RenderObject.h" | 30 #include "core/rendering/RenderObject.h" |
| 32 #include "core/rendering/svg/RenderSVGInlineText.h" | 31 #include "core/rendering/svg/RenderSVGInlineText.h" |
| 33 #include "core/rendering/svg/RenderSVGResourceSolidColor.h" | 32 #include "core/rendering/svg/RenderSVGResourceSolidColor.h" |
| 34 #include "core/svg/SVGFontData.h" | 33 #include "core/svg/SVGFontData.h" |
| 35 #include "core/svg/SVGFontElement.h" | 34 #include "core/svg/SVGFontElement.h" |
| 36 #include "core/svg/SVGFontFaceElement.h" | 35 #include "core/svg/SVGFontFaceElement.h" |
| 37 #include "core/svg/SVGGlyphElement.h" | 36 #include "core/svg/SVGGlyphElement.h" |
| 37 #include "platform/fonts/GlyphBuffer.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 static inline const SVGFontData* svgFontAndFontFaceElementForFontData(const Simp
leFontData* fontData, SVGFontFaceElement*& fontFace, SVGFontElement*& font) | 41 static inline const SVGFontData* svgFontAndFontFaceElementForFontData(const Simp
leFontData* fontData, SVGFontFaceElement*& fontFace, SVGFontElement*& font) |
| 42 { | 42 { |
| 43 ASSERT(fontData); | 43 ASSERT(fontData); |
| 44 ASSERT(fontData->isCustomFont()); | 44 ASSERT(fontData->isCustomFont()); |
| 45 ASSERT(fontData->isSVGFont()); | 45 ASSERT(fontData->isSVGFont()); |
| 46 | 46 |
| 47 const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->f
ontData()); | 47 const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->f
ontData()); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 // Restore original state of the SVG Font glyph table and the current font f
allback list, | 239 // Restore original state of the SVG Font glyph table and the current font f
allback list, |
| 240 // to assure the next lookup of the same glyph won't immediately return the
fallback glyph. | 240 // to assure the next lookup of the same glyph won't immediately return the
fallback glyph. |
| 241 page->setGlyphDataForCharacter(character, glyphData.glyph, originalFontData)
; | 241 page->setGlyphDataForCharacter(character, glyphData.glyph, originalFontData)
; |
| 242 ASSERT(fallbackGlyphData.fontData); | 242 ASSERT(fallbackGlyphData.fontData); |
| 243 return fallbackGlyphData; | 243 return fallbackGlyphData; |
| 244 } | 244 } |
| 245 | 245 |
| 246 } | 246 } |
| 247 | 247 |
| 248 #endif | 248 #endif |
| OLD | NEW |