| 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/dom/Document.h" |  | 
| 32 #include "core/loader/cache/CachedFont.h" | 31 #include "core/loader/cache/CachedFont.h" | 
| 33 #include "core/loader/cache/CachedResourceLoader.h" |  | 
| 34 #include "core/platform/HistogramSupport.h" | 32 #include "core/platform/HistogramSupport.h" | 
| 35 #include "core/platform/graphics/FontCache.h" | 33 #include "core/platform/graphics/FontCache.h" | 
| 36 #include "core/platform/graphics/FontDescription.h" | 34 #include "core/platform/graphics/FontDescription.h" | 
| 37 #include "core/platform/graphics/SimpleFontData.h" | 35 #include "core/platform/graphics/SimpleFontData.h" | 
| 38 #include "wtf/CurrentTime.h" | 36 #include "wtf/CurrentTime.h" | 
| 39 | 37 | 
| 40 #if ENABLE(SVG_FONTS) | 38 #if ENABLE(SVG_FONTS) | 
| 41 #include "SVGNames.h" | 39 #include "SVGNames.h" | 
| 42 #include "core/svg/SVGFontData.h" | 40 #include "core/svg/SVGFontData.h" | 
| 43 #include "core/svg/SVGFontElement.h" | 41 #include "core/svg/SVGFontElement.h" | 
| 44 #include "core/svg/SVGFontFaceElement.h" | 42 #include "core/svg/SVGFontFaceElement.h" | 
| 45 #include "core/svg/SVGURIReference.h" |  | 
| 46 #endif | 43 #endif | 
| 47 | 44 | 
| 48 namespace WebCore { | 45 namespace WebCore { | 
| 49 | 46 | 
| 50 CSSFontFaceSource::CSSFontFaceSource(const String& str, CachedFont* font) | 47 CSSFontFaceSource::CSSFontFaceSource(const String& str, CachedFont* font) | 
| 51     : m_string(str) | 48     : m_string(str) | 
| 52     , m_font(font) | 49     , m_font(font) | 
| 53     , m_face(0) | 50     , m_face(0) | 
| 54 #if ENABLE(SVG_FONTS) | 51 #if ENABLE(SVG_FONTS) | 
| 55     , m_hasExternalSVGFont(false) | 52     , m_hasExternalSVGFont(false) | 
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 263     if (size < 50 * 1024) | 260     if (size < 50 * 1024) | 
| 264         return "WebFont.LoadTime.1.10KBTo50KB"; | 261         return "WebFont.LoadTime.1.10KBTo50KB"; | 
| 265     if (size < 100 * 1024) | 262     if (size < 100 * 1024) | 
| 266         return "WebFont.LoadTime.2.50KBTo100KB"; | 263         return "WebFont.LoadTime.2.50KBTo100KB"; | 
| 267     if (size < 1024 * 1024) | 264     if (size < 1024 * 1024) | 
| 268         return "WebFont.LoadTime.3.100KBTo1MB"; | 265         return "WebFont.LoadTime.3.100KBTo1MB"; | 
| 269     return "WebFont.LoadTime.4.Over1MB"; | 266     return "WebFont.LoadTime.4.Over1MB"; | 
| 270 } | 267 } | 
| 271 | 268 | 
| 272 } | 269 } | 
| OLD | NEW | 
|---|