Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: sky/engine/core/css/RemoteFontFaceSource.cpp

Issue 1223843003: Remove support for loading remote font faces (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/RemoteFontFaceSource.h ('k') | sky/engine/core/css/parser/BisonCSSParser-in.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/RemoteFontFaceSource.cpp
diff --git a/sky/engine/core/css/RemoteFontFaceSource.cpp b/sky/engine/core/css/RemoteFontFaceSource.cpp
deleted file mode 100644
index 70629ff6f4a9148e5340d961470ae9060efc1daa..0000000000000000000000000000000000000000
--- a/sky/engine/core/css/RemoteFontFaceSource.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "sky/engine/core/css/RemoteFontFaceSource.h"
-
-#include "sky/engine/core/css/CSSCustomFontData.h"
-#include "sky/engine/core/css/CSSFontFace.h"
-#include "sky/engine/core/css/FontLoader.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontDescription.h"
-#include "sky/engine/platform/fonts/SimpleFontData.h"
-#include "sky/engine/public/platform/Platform.h"
-#include "sky/engine/wtf/CurrentTime.h"
-
-namespace blink {
-
-RemoteFontFaceSource::RemoteFontFaceSource(FontResource* font, PassRefPtr<FontLoader> fontLoader)
- : m_font(font)
- , m_fontLoader(fontLoader)
-{
- m_font->addClient(this);
-}
-
-RemoteFontFaceSource::~RemoteFontFaceSource()
-{
- m_font->removeClient(this);
- pruneTable();
-}
-
-void RemoteFontFaceSource::pruneTable()
-{
- if (m_fontDataTable.isEmpty())
- return;
-
- for (FontDataTable::iterator it = m_fontDataTable.begin(); it != m_fontDataTable.end(); ++it) {
- SimpleFontData* fontData = it->value.get();
- if (fontData && fontData->customFontData())
- fontData->customFontData()->clearFontFaceSource();
- }
- m_fontDataTable.clear();
-}
-
-bool RemoteFontFaceSource::isLoading() const
-{
- return !m_font->stillNeedsLoad() && !m_font->isLoaded();
-}
-
-bool RemoteFontFaceSource::isLoaded() const
-{
- return m_font->isLoaded();
-}
-
-bool RemoteFontFaceSource::isValid() const
-{
- return !m_font->errorOccurred();
-}
-
-void RemoteFontFaceSource::didStartFontLoad(FontResource*)
-{
- // We may send duplicated reports when multiple CSSFontFaceSource are
- // registered at this FontResource. Associating the same URL to different
- // font-family causes the case, but we treat them as indivisual resources.
- m_histograms.loadStarted();
-}
-
-void RemoteFontFaceSource::fontLoaded(FontResource*)
-{
- m_histograms.recordRemoteFont(m_font.get());
-
- pruneTable();
- if (m_face) {
- m_fontLoader->fontFaceInvalidated();
- m_face->fontLoaded(this);
- }
-}
-
-void RemoteFontFaceSource::fontLoadWaitLimitExceeded(FontResource*)
-{
- pruneTable();
- if (m_face) {
- m_fontLoader->fontFaceInvalidated();
- m_face->fontLoadWaitLimitExceeded(this);
- }
-
- m_histograms.recordFallbackTime(m_font.get());
-}
-
-PassRefPtr<SimpleFontData> RemoteFontFaceSource::createFontData(const FontDescription& fontDescription)
-{
- if (!isLoaded())
- return createLoadingFallbackFontData(fontDescription);
-
- // Create new FontPlatformData from our CGFontRef, point size and ATSFontRef.
- if (!m_font->ensureCustomFontData())
- return nullptr;
-
- m_histograms.recordFallbackTime(m_font.get());
-
- return SimpleFontData::create(
- m_font->platformDataFromCustomData(fontDescription.effectiveFontSize(),
- fontDescription.isSyntheticBold(), fontDescription.isSyntheticItalic(),
- fontDescription.orientation(), fontDescription.widthVariant()), CustomFontData::create());
-}
-
-PassRefPtr<SimpleFontData> RemoteFontFaceSource::createLoadingFallbackFontData(const FontDescription& fontDescription)
-{
- // This temporary font is not retained and should not be returned.
- FontCachePurgePreventer fontCachePurgePreventer;
- SimpleFontData* temporaryFont = FontCache::fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
- if (!temporaryFont) {
- ASSERT_NOT_REACHED();
- return nullptr;
- }
- RefPtr<CSSCustomFontData> cssFontData = CSSCustomFontData::create(this, m_font->exceedsFontLoadWaitLimit() ? CSSCustomFontData::VisibleFallback : CSSCustomFontData::InvisibleFallback);
- return SimpleFontData::create(temporaryFont->platformData(), cssFontData);
-}
-
-void RemoteFontFaceSource::beginLoadIfNeeded()
-{
- if (m_font->stillNeedsLoad())
- m_fontLoader->addFontToBeginLoading(m_font.get());
-
- if (m_face)
- m_face->didBeginLoad();
-}
-
-bool RemoteFontFaceSource::ensureFontData()
-{
- return m_font->ensureCustomFontData();
-}
-
-void RemoteFontFaceSource::FontLoadHistograms::loadStarted()
-{
- if (!m_loadStartTime)
- m_loadStartTime = currentTimeMS();
-}
-
-void RemoteFontFaceSource::FontLoadHistograms::fallbackFontPainted()
-{
- if (!m_fallbackPaintTime)
- m_fallbackPaintTime = currentTimeMS();
-}
-
-void RemoteFontFaceSource::FontLoadHistograms::recordFallbackTime(const FontResource* font)
-{
- if (m_fallbackPaintTime <= 0)
- return;
- int duration = static_cast<int>(currentTimeMS() - m_fallbackPaintTime);
- blink::Platform::current()->histogramCustomCounts("WebFont.BlankTextShownTime", duration, 0, 10000, 50);
- m_fallbackPaintTime = -1;
-}
-
-void RemoteFontFaceSource::FontLoadHistograms::recordRemoteFont(const FontResource* font)
-{
- if (m_loadStartTime > 0 && font && !font->isLoading()) {
- int duration = static_cast<int>(currentTimeMS() - m_loadStartTime);
- blink::Platform::current()->histogramCustomCounts(histogramName(font), duration, 0, 10000, 50);
- m_loadStartTime = -1;
-
- enum { Miss, Hit, DataUrl, CacheHitEnumMax };
- int histogramValue = font->url().protocolIsData() ? DataUrl
- : font->response().wasCached() ? Hit
- : Miss;
- blink::Platform::current()->histogramEnumeration("WebFont.CacheHit", histogramValue, CacheHitEnumMax);
-
- enum { CORSFail, CORSSuccess, CORSEnumMax };
- int corsValue = font->isCORSFailed() ? CORSFail : CORSSuccess;
- blink::Platform::current()->histogramEnumeration("WebFont.CORSSuccess", corsValue, CORSEnumMax);
- }
-}
-
-const char* RemoteFontFaceSource::FontLoadHistograms::histogramName(const FontResource* font)
-{
- if (font->errorOccurred())
- return "WebFont.DownloadTime.LoadError";
-
- unsigned size = font->encodedSize();
- if (size < 10 * 1024)
- return "WebFont.DownloadTime.0.Under10KB";
- if (size < 50 * 1024)
- return "WebFont.DownloadTime.1.10KBTo50KB";
- if (size < 100 * 1024)
- return "WebFont.DownloadTime.2.50KBTo100KB";
- if (size < 1024 * 1024)
- return "WebFont.DownloadTime.3.100KBTo1MB";
- return "WebFont.DownloadTime.4.Over1MB";
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/css/RemoteFontFaceSource.h ('k') | sky/engine/core/css/parser/BisonCSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698