| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Torch Mobile, Inc. | 3 * Copyright (C) 2009 Torch Mobile, Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/loader/cache/CachedFont.h" | 28 #include "core/loader/cache/CachedFont.h" |
| 29 | 29 |
| 30 #include "core/dom/WebCoreMemoryInstrumentation.h" | 30 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 31 #include "core/loader/TextResourceDecoder.h" | 31 #include "core/loader/TextResourceDecoder.h" |
| 32 #include "core/loader/cache/CachedResourceClient.h" | 32 #include "core/loader/cache/CachedResourceClient.h" |
| 33 #include "core/loader/cache/CachedResourceClientWalker.h" | 33 #include "core/loader/cache/CachedResourceClientWalker.h" |
| 34 #include "core/loader/cache/CachedResourceLoader.h" | |
| 35 #include "core/loader/cache/MemoryCache.h" | |
| 36 #include "core/platform/SharedBuffer.h" | 34 #include "core/platform/SharedBuffer.h" |
| 37 #include "core/platform/graphics/FontCustomPlatformData.h" | 35 #include "core/platform/graphics/FontCustomPlatformData.h" |
| 38 #include "core/platform/graphics/FontPlatformData.h" | 36 #include "core/platform/graphics/FontPlatformData.h" |
| 39 #include <wtf/Vector.h> | |
| 40 | 37 |
| 41 #if ENABLE(SVG_FONTS) | 38 #if ENABLE(SVG_FONTS) |
| 42 #include "SVGNames.h" | 39 #include "SVGNames.h" |
| 43 #include "core/dom/NodeList.h" | 40 #include "core/dom/NodeList.h" |
| 44 #include "core/svg/SVGDocument.h" | 41 #include "core/svg/SVGDocument.h" |
| 45 #include "core/svg/SVGElement.h" | |
| 46 #include "core/svg/SVGFontElement.h" | 42 #include "core/svg/SVGFontElement.h" |
| 47 #include "core/svg/SVGGElement.h" | |
| 48 #endif | 43 #endif |
| 49 | 44 |
| 50 namespace WebCore { | 45 namespace WebCore { |
| 51 | 46 |
| 52 CachedFont::CachedFont(const ResourceRequest& resourceRequest) | 47 CachedFont::CachedFont(const ResourceRequest& resourceRequest) |
| 53 : CachedResource(resourceRequest, FontResource) | 48 : CachedResource(resourceRequest, FontResource) |
| 54 , m_fontData(0) | 49 , m_fontData(0) |
| 55 , m_loadInitiated(false) | 50 , m_loadInitiated(false) |
| 56 { | 51 { |
| 57 } | 52 } |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 { | 167 { |
| 173 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou
rceFont); | 168 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou
rceFont); |
| 174 CachedResource::reportMemoryUsage(memoryObjectInfo); | 169 CachedResource::reportMemoryUsage(memoryObjectInfo); |
| 175 #if ENABLE(SVG_FONTS) | 170 #if ENABLE(SVG_FONTS) |
| 176 info.addMember(m_externalSVGDocument, "externalSVGDocument"); | 171 info.addMember(m_externalSVGDocument, "externalSVGDocument"); |
| 177 #endif | 172 #endif |
| 178 info.addMember(m_fontData, "fontData"); | 173 info.addMember(m_fontData, "fontData"); |
| 179 } | 174 } |
| 180 | 175 |
| 181 } | 176 } |
| OLD | NEW |