| 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 "CSSFontFaceSource.h" | 27 #include "CSSFontFaceSource.h" |
| 28 | 28 |
| 29 #include "CSSFontFace.h" | 29 #include "CSSFontFace.h" |
| 30 #include "CSSFontSelector.h" | 30 #include "CSSFontSelector.h" |
| 31 #include "CachedFont.h" | |
| 32 #include "CachedResourceLoader.h" | |
| 33 #include "Document.h" | 31 #include "Document.h" |
| 32 #include "core/loader/cache/CachedFont.h" |
| 33 #include "core/loader/cache/CachedResourceLoader.h" |
| 34 #include "core/platform/graphics/FontCache.h" | 34 #include "core/platform/graphics/FontCache.h" |
| 35 #include "core/platform/graphics/FontDescription.h" | 35 #include "core/platform/graphics/FontDescription.h" |
| 36 #include "core/platform/graphics/SimpleFontData.h" | 36 #include "core/platform/graphics/SimpleFontData.h" |
| 37 | 37 |
| 38 #if ENABLE(SVG_FONTS) | 38 #if ENABLE(SVG_FONTS) |
| 39 #include "FontCustomPlatformData.h" | 39 #include "FontCustomPlatformData.h" |
| 40 #include "SVGFontData.h" | 40 #include "SVGFontData.h" |
| 41 #include "SVGFontElement.h" | 41 #include "SVGFontElement.h" |
| 42 #include "SVGFontFaceElement.h" | 42 #include "SVGFontFaceElement.h" |
| 43 #include "SVGNames.h" | 43 #include "SVGNames.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 if (!m_font) | 217 if (!m_font) |
| 218 return false; | 218 return false; |
| 219 #if ENABLE(SVG_FONTS) | 219 #if ENABLE(SVG_FONTS) |
| 220 if (m_hasExternalSVGFont) | 220 if (m_hasExternalSVGFont) |
| 221 return m_font->ensureSVGFontData(); | 221 return m_font->ensureSVGFontData(); |
| 222 #endif | 222 #endif |
| 223 return m_font->ensureCustomFontData(); | 223 return m_font->ensureCustomFontData(); |
| 224 } | 224 } |
| 225 | 225 |
| 226 } | 226 } |
| OLD | NEW |