| 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 10 matching lines...) Expand all Loading... |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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 "FontCustomPlatformData.h" | 30 #include "FontCustomPlatformData.h" |
| 31 #include "WebCoreMemoryInstrumentation.h" | 31 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 32 #include "core/loader/TextResourceDecoder.h" | 32 #include "core/loader/TextResourceDecoder.h" |
| 33 #include "core/loader/cache/CachedResourceClient.h" | 33 #include "core/loader/cache/CachedResourceClient.h" |
| 34 #include "core/loader/cache/CachedResourceClientWalker.h" | 34 #include "core/loader/cache/CachedResourceClientWalker.h" |
| 35 #include "core/loader/cache/CachedResourceLoader.h" | 35 #include "core/loader/cache/CachedResourceLoader.h" |
| 36 #include "core/loader/cache/MemoryCache.h" | 36 #include "core/loader/cache/MemoryCache.h" |
| 37 #include "core/platform/SharedBuffer.h" | 37 #include "core/platform/SharedBuffer.h" |
| 38 #include "core/platform/graphics/FontPlatformData.h" | 38 #include "core/platform/graphics/FontPlatformData.h" |
| 39 #include <wtf/Vector.h> | 39 #include <wtf/Vector.h> |
| 40 | 40 |
| 41 #if ENABLE(SVG_FONTS) | 41 #if ENABLE(SVG_FONTS) |
| 42 #include "NodeList.h" | |
| 43 #include "SVGDocument.h" | 42 #include "SVGDocument.h" |
| 44 #include "SVGElement.h" | 43 #include "SVGElement.h" |
| 45 #include "SVGFontElement.h" | 44 #include "SVGFontElement.h" |
| 46 #include "SVGGElement.h" | 45 #include "SVGGElement.h" |
| 47 #include "SVGNames.h" | 46 #include "SVGNames.h" |
| 47 #include "core/dom/NodeList.h" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 namespace WebCore { | 50 namespace WebCore { |
| 51 | 51 |
| 52 CachedFont::CachedFont(const ResourceRequest& resourceRequest) | 52 CachedFont::CachedFont(const ResourceRequest& resourceRequest) |
| 53 : CachedResource(resourceRequest, FontResource) | 53 : CachedResource(resourceRequest, FontResource) |
| 54 , m_fontData(0) | 54 , m_fontData(0) |
| 55 , m_loadInitiated(false) | 55 , m_loadInitiated(false) |
| 56 { | 56 { |
| 57 } | 57 } |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 { | 171 { |
| 172 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou
rceFont); | 172 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou
rceFont); |
| 173 CachedResource::reportMemoryUsage(memoryObjectInfo); | 173 CachedResource::reportMemoryUsage(memoryObjectInfo); |
| 174 #if ENABLE(SVG_FONTS) | 174 #if ENABLE(SVG_FONTS) |
| 175 info.addMember(m_externalSVGDocument, "externalSVGDocument"); | 175 info.addMember(m_externalSVGDocument, "externalSVGDocument"); |
| 176 #endif | 176 #endif |
| 177 info.addMember(m_fontData, "fontData"); | 177 info.addMember(m_fontData, "fontData"); |
| 178 } | 178 } |
| 179 | 179 |
| 180 } | 180 } |
| OLD | NEW |