| 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 12 matching lines...) Expand all Loading... |
| 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/fetch/FontResource.h" | 28 #include "core/fetch/FontResource.h" |
| 29 | 29 |
| 30 #include "core/fetch/ResourceClient.h" | 30 #include "core/fetch/ResourceClient.h" |
| 31 #include "core/fetch/ResourceClientWalker.h" | 31 #include "core/fetch/ResourceClientWalker.h" |
| 32 #include "core/fetch/TextResourceDecoder.h" | 32 #include "core/fetch/TextResourceDecoder.h" |
| 33 #include "core/platform/HistogramSupport.h" | |
| 34 #include "platform/SharedBuffer.h" | |
| 35 #include "core/platform/graphics/FontCustomPlatformData.h" | 33 #include "core/platform/graphics/FontCustomPlatformData.h" |
| 36 #include "core/platform/graphics/FontPlatformData.h" | 34 #include "core/platform/graphics/FontPlatformData.h" |
| 35 #include "platform/SharedBuffer.h" |
| 36 #include "public/platform/Platform.h" |
| 37 #include "wtf/CurrentTime.h" | 37 #include "wtf/CurrentTime.h" |
| 38 | 38 |
| 39 #if ENABLE(SVG_FONTS) | 39 #if ENABLE(SVG_FONTS) |
| 40 #include "SVGNames.h" | 40 #include "SVGNames.h" |
| 41 #include "core/dom/NodeList.h" | 41 #include "core/dom/NodeList.h" |
| 42 #include "core/svg/SVGDocument.h" | 42 #include "core/svg/SVGDocument.h" |
| 43 #include "core/svg/SVGFontElement.h" | 43 #include "core/svg/SVGFontElement.h" |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 namespace WebCore { | 46 namespace WebCore { |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 | 167 |
| 168 void FontResource::willUseFontData() | 168 void FontResource::willUseFontData() |
| 169 { | 169 { |
| 170 if (!isLoaded()) | 170 if (!isLoaded()) |
| 171 m_histograms.willUseFontData(); | 171 m_histograms.willUseFontData(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 FontResource::FontResourceHistograms::~FontResourceHistograms() | 174 FontResource::FontResourceHistograms::~FontResourceHistograms() |
| 175 { | 175 { |
| 176 if (m_styledTime > 0) | 176 if (m_styledTime > 0) |
| 177 HistogramSupport::histogramEnumeration("WebFont.Resource.UsageType", Sty
ledButNotUsed, UsageTypeMax); | 177 WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.Usag
eType", StyledButNotUsed, UsageTypeMax); |
| 178 } | 178 } |
| 179 | 179 |
| 180 void FontResource::FontResourceHistograms::willUseFontData() | 180 void FontResource::FontResourceHistograms::willUseFontData() |
| 181 { | 181 { |
| 182 if (!m_styledTime) | 182 if (!m_styledTime) |
| 183 m_styledTime = currentTimeMS(); | 183 m_styledTime = currentTimeMS(); |
| 184 } | 184 } |
| 185 | 185 |
| 186 void FontResource::FontResourceHistograms::loadStarted() | 186 void FontResource::FontResourceHistograms::loadStarted() |
| 187 { | 187 { |
| 188 if (m_styledTime < 0) | 188 if (m_styledTime < 0) |
| 189 return; | 189 return; |
| 190 if (!m_styledTime) { | 190 if (!m_styledTime) { |
| 191 HistogramSupport::histogramEnumeration("WebFont.Resource.UsageType", Not
StyledButUsed, UsageTypeMax); | 191 WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.Usag
eType", NotStyledButUsed, UsageTypeMax); |
| 192 } else { | 192 } else { |
| 193 int duration = static_cast<int>(currentTimeMS() - m_styledTime); | 193 int duration = static_cast<int>(currentTimeMS() - m_styledTime); |
| 194 HistogramSupport::histogramCustomCounts("WebFont.Resource.StyleRecalcToD
ownloadLatency", duration, 0, 10000, 50); | 194 WebKit::Platform::current()->histogramCustomCounts("WebFont.Resource.Sty
leRecalcToDownloadLatency", duration, 0, 10000, 50); |
| 195 HistogramSupport::histogramEnumeration("WebFont.Resource.UsageType", Sty
ledAndUsed, UsageTypeMax); | 195 WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.Usag
eType", StyledAndUsed, UsageTypeMax); |
| 196 } | 196 } |
| 197 m_styledTime = -1; | 197 m_styledTime = -1; |
| 198 } | 198 } |
| 199 | 199 |
| 200 } | 200 } |
| OLD | NEW |