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

Unified Diff: sky/engine/core/css/FontLoader.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/FontLoader.h ('k') | sky/engine/core/css/RemoteFontFaceSource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/FontLoader.cpp
diff --git a/sky/engine/core/css/FontLoader.cpp b/sky/engine/core/css/FontLoader.cpp
deleted file mode 100644
index 2f432e5d4b2f377b09b2391af56389ea0d86fd89..0000000000000000000000000000000000000000
--- a/sky/engine/core/css/FontLoader.cpp
+++ /dev/null
@@ -1,95 +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/FontLoader.h"
-
-#include "sky/engine/core/css/CSSFontSelector.h"
-#include "sky/engine/core/fetch/FontResource.h"
-#include "sky/engine/core/fetch/ResourceFetcher.h"
-
-namespace blink {
-
-FontLoader::FontLoader(CSSFontSelector* fontSelector, ResourceFetcher* resourceFetcher)
- : m_beginLoadingTimer(this, &FontLoader::beginLoadTimerFired)
- , m_fontSelector(fontSelector)
- , m_resourceFetcher(resourceFetcher)
-{
-}
-
-FontLoader::~FontLoader()
-{
-#if ENABLE(OILPAN)
- if (!m_resourceFetcher) {
- ASSERT(m_fontsToBeginLoading.isEmpty());
- return;
- }
- m_beginLoadingTimer.stop();
- // This will decrement the request counts on the ResourceFetcher for all the
- // fonts that were pending at the time the FontLoader dies.
- clearPendingFonts();
-#endif
-}
-
-void FontLoader::addFontToBeginLoading(FontResource* fontResource)
-{
- if (!m_resourceFetcher || !fontResource->stillNeedsLoad() || fontResource->loadScheduled())
- return;
-
- m_fontsToBeginLoading.append(
- std::make_pair(fontResource, ResourceLoader::RequestCountTracker(m_resourceFetcher, fontResource)));
- fontResource->didScheduleLoad();
- if (!m_beginLoadingTimer.isActive())
- m_beginLoadingTimer.startOneShot(0, FROM_HERE);
-}
-
-void FontLoader::beginLoadTimerFired(Timer<blink::FontLoader>*)
-{
- loadPendingFonts();
-}
-
-void FontLoader::loadPendingFonts()
-{
- ASSERT(m_resourceFetcher);
-
- FontsToLoadVector fontsToBeginLoading;
- fontsToBeginLoading.swap(m_fontsToBeginLoading);
- for (FontsToLoadVector::iterator it = fontsToBeginLoading.begin(); it != fontsToBeginLoading.end(); ++it) {
- FontResource* fontResource = it->first.get();
- fontResource->beginLoadIfNeeded(m_resourceFetcher);
- }
-
- // When the local fontsToBeginLoading vector goes out of scope it will
- // decrement the request counts on the ResourceFetcher for all the fonts
- // that were just loaded.
-}
-
-void FontLoader::fontFaceInvalidated()
-{
- if (m_fontSelector)
- m_fontSelector->fontFaceInvalidated();
-}
-
-#if !ENABLE(OILPAN)
-void FontLoader::clearResourceFetcherAndFontSelector()
-{
- if (!m_resourceFetcher) {
- ASSERT(m_fontsToBeginLoading.isEmpty());
- return;
- }
-
- m_beginLoadingTimer.stop();
- clearPendingFonts();
- m_resourceFetcher = nullptr;
- m_fontSelector = nullptr;
-}
-#endif
-
-void FontLoader::clearPendingFonts()
-{
- for (FontsToLoadVector::iterator it = m_fontsToBeginLoading.begin(); it != m_fontsToBeginLoading.end(); ++it)
- it->first->didUnscheduleLoad();
- m_fontsToBeginLoading.clear();
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/css/FontLoader.h ('k') | sky/engine/core/css/RemoteFontFaceSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698