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

Unified Diff: sky/engine/core/css/resolver/ScopedStyleResolver.cpp

Issue 851873002: Move @font-face logic from ScopedStyleResolver to StyleEngine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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/resolver/ScopedStyleResolver.h ('k') | sky/engine/core/dom/StyleEngine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/ScopedStyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/ScopedStyleResolver.cpp b/sky/engine/core/css/resolver/ScopedStyleResolver.cpp
index 5abe00f94655b09ffa88e3016d6e60fbc3ca3cf3..20414b88095674223ac94335e35d23c24508488f 100644
--- a/sky/engine/core/css/resolver/ScopedStyleResolver.cpp
+++ b/sky/engine/core/css/resolver/ScopedStyleResolver.cpp
@@ -27,9 +27,6 @@
#include "sky/engine/config.h"
#include "sky/engine/core/css/resolver/ScopedStyleResolver.h"
-#include "sky/engine/core/css/CSSFontSelector.h"
-#include "sky/engine/core/css/CSSStyleSheet.h"
-#include "sky/engine/core/css/FontFace.h"
#include "sky/engine/core/css/RuleFeature.h"
#include "sky/engine/core/css/StyleRule.h"
#include "sky/engine/core/css/StyleSheetContents.h"
@@ -60,17 +57,6 @@ void ScopedStyleResolver::appendStyleSheet(CSSStyleSheet& sheet)
const RuleSet& ruleSet = sheet.contents()->ensureRuleSet();
m_features.add(ruleSet.features());
-
- if (m_scope.rootNode().isDocumentNode()) {
- CSSFontSelector* fontSelector = document.styleEngine()->fontSelector();
- RuleSet& ruleSet = sheet.contents()->ruleSet();
- for (const auto& rule : ruleSet.fontFaceRules()) {
- if (RefPtr<FontFace> fontFace = FontFace::create(&document, rule))
- fontSelector->fontFaceCache()->add(fontSelector, rule, fontFace);
- }
- if (!ruleSet.fontFaceRules().isEmpty())
- styleResolver.invalidateMatchedPropertiesCache();
- }
}
void ScopedStyleResolver::updateActiveStyleSheets()
« no previous file with comments | « sky/engine/core/css/resolver/ScopedStyleResolver.h ('k') | sky/engine/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698