| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/css/CSSFontFaceSource.h" | 27 #include "core/css/CSSFontFaceSource.h" |
| 28 | 28 |
| 29 #include "core/css/CSSFontFace.h" | 29 #include "core/css/CSSFontFace.h" |
| 30 #include "core/css/CSSFontSelector.h" | 30 #include "core/css/CSSFontSelector.h" |
| 31 #include "core/css/CSSSegmentedFontFace.h" |
| 31 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
| 32 #include "core/loader/cache/CachedFont.h" | 33 #include "core/loader/cache/CachedFont.h" |
| 33 #include "core/loader/cache/CachedResourceLoader.h" | 34 #include "core/loader/cache/CachedResourceLoader.h" |
| 34 #include "core/platform/graphics/FontCache.h" | 35 #include "core/platform/graphics/FontCache.h" |
| 35 #include "core/platform/graphics/FontDescription.h" | 36 #include "core/platform/graphics/FontDescription.h" |
| 36 #include "core/platform/graphics/SimpleFontData.h" | 37 #include "core/platform/graphics/SimpleFontData.h" |
| 37 | 38 |
| 38 #if ENABLE(SVG_FONTS) | 39 #if ENABLE(SVG_FONTS) |
| 39 #include "SVGNames.h" | 40 #include "SVGNames.h" |
| 40 #include "core/svg/SVGFontData.h" | 41 #include "core/svg/SVGFontData.h" |
| 41 #include "core/svg/SVGFontElement.h" | 42 #include "core/svg/SVGFontElement.h" |
| 42 #include "core/svg/SVGFontFaceElement.h" | 43 #include "core/svg/SVGFontFaceElement.h" |
| 43 #include "core/svg/SVGURIReference.h" | 44 #include "core/svg/SVGURIReference.h" |
| 44 #endif | 45 #endif |
| 45 | 46 |
| 46 namespace WebCore { | 47 namespace WebCore { |
| 47 | 48 |
| 48 CSSFontFaceSource::CSSFontFaceSource(const String& str, CachedFont* font) | 49 CSSFontFaceSource::CSSFontFaceSource(const String& str, CachedFont* font) |
| 49 : m_string(str) | 50 : m_string(str) |
| 50 , m_font(font) | 51 , m_font(font) |
| 51 , m_face(0) | 52 , m_face(nullptr) |
| 52 #if ENABLE(SVG_FONTS) | 53 #if ENABLE(SVG_FONTS) |
| 53 , m_hasExternalSVGFont(false) | 54 , m_hasExternalSVGFont(false) |
| 54 #endif | 55 #endif |
| 55 { | 56 { |
| 56 if (m_font) | 57 if (m_font) |
| 57 m_font->addClient(this); | 58 m_font->addClient(this); |
| 58 } | 59 } |
| 59 | 60 |
| 60 CSSFontFaceSource::~CSSFontFaceSource() | 61 CSSFontFaceSource::~CSSFontFaceSource() |
| 61 { | 62 { |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 if (!m_font) | 217 if (!m_font) |
| 217 return false; | 218 return false; |
| 218 #if ENABLE(SVG_FONTS) | 219 #if ENABLE(SVG_FONTS) |
| 219 if (m_hasExternalSVGFont) | 220 if (m_hasExternalSVGFont) |
| 220 return m_font->ensureSVGFontData(); | 221 return m_font->ensureSVGFontData(); |
| 221 #endif | 222 #endif |
| 222 return m_font->ensureCustomFontData(); | 223 return m_font->ensureCustomFontData(); |
| 223 } | 224 } |
| 224 | 225 |
| 225 } | 226 } |
| OLD | NEW |