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

Unified Diff: sky/engine/core/css/CSSFontSelector.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/CSSFontSelector.h ('k') | sky/engine/core/css/CSSSegmentedFontFace.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSFontSelector.cpp
diff --git a/sky/engine/core/css/CSSFontSelector.cpp b/sky/engine/core/css/CSSFontSelector.cpp
index 60ae8fbb366f04432ab23f399c86547fbdfa4b40..5ac763e18f99a0ae1e14a22aaa6ce605da32df40 100644
--- a/sky/engine/core/css/CSSFontSelector.cpp
+++ b/sky/engine/core/css/CSSFontSelector.cpp
@@ -30,7 +30,7 @@
#include "sky/engine/core/css/CSSFontSelectorClient.h"
#include "sky/engine/core/css/CSSSegmentedFontFace.h"
#include "sky/engine/core/css/CSSValueList.h"
-#include "sky/engine/core/css/FontFaceSet.h"
+#include "sky/engine/core/css/FontFace.h"
#include "sky/engine/core/css/resolver/StyleResolver.h"
#include "sky/engine/core/dom/Document.h"
#include "sky/engine/core/frame/LocalFrame.h"
@@ -43,7 +43,6 @@ namespace blink {
CSSFontSelector::CSSFontSelector(Document* document)
: m_document(document)
- , m_fontLoader(FontLoader::create(this, document->fetcher()))
, m_genericFontFamilySettings(document->frame()->settings()->genericFontFamilySettings())
{
// FIXME: An old comment used to say there was no need to hold a reference to m_document
@@ -53,7 +52,6 @@ CSSFontSelector::CSSFontSelector(Document* document)
ASSERT(m_document);
ASSERT(m_document->frame());
FontCache::fontCache()->addClient(this);
- FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
}
CSSFontSelector::~CSSFontSelector()
@@ -156,7 +154,6 @@ bool CSSFontSelector::isPlatformFontAvailable(const FontDescription& fontDescrip
#if !ENABLE(OILPAN)
void CSSFontSelector::clearDocument()
{
- m_fontLoader->clearResourceFetcherAndFontSelector();
m_document = nullptr;
m_fontFaceCache.clearAll();
}
« no previous file with comments | « sky/engine/core/css/CSSFontSelector.h ('k') | sky/engine/core/css/CSSSegmentedFontFace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698