| Index: sky/engine/core/dom/DocumentStyleSheetCollection.cpp
|
| diff --git a/sky/engine/core/dom/DocumentStyleSheetCollection.cpp b/sky/engine/core/dom/DocumentStyleSheetCollection.cpp
|
| index 8e974f8a4f34afd0a6a1db484a8008dc691f11ef..2e18aa0afe22cf82a0b36b90d1970d459c4d0272 100644
|
| --- a/sky/engine/core/dom/DocumentStyleSheetCollection.cpp
|
| +++ b/sky/engine/core/dom/DocumentStyleSheetCollection.cpp
|
| @@ -67,33 +67,20 @@ void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Docum
|
| collectStyleSheetsFromCandidates(engine, collector);
|
| }
|
|
|
| -void DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine, StyleResolverUpdateMode updateMode)
|
| +void DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine)
|
| {
|
| StyleSheetCollection collection;
|
| ActiveDocumentStyleSheetCollector collector(collection);
|
| collectStyleSheets(engine, collector);
|
|
|
| - StyleSheetChange change;
|
| - analyzeStyleSheetChange(updateMode, collection, change);
|
| + engine->clearMasterResolver();
|
| + // FIMXE: The following depends on whether StyleRuleFontFace was modified or not.
|
| + // No need to always-clear font cache.
|
| + engine->clearFontCache();
|
|
|
| - if (change.styleResolverUpdateType == Reconstruct) {
|
| - engine->clearMasterResolver();
|
| - // FIMXE: The following depends on whether StyleRuleFontFace was modified or not.
|
| - // No need to always-clear font cache.
|
| - engine->clearFontCache();
|
| - } else if (StyleResolver* styleResolver = engine->resolver()) {
|
| - if (change.styleResolverUpdateType != Additive) {
|
| - ASSERT(change.styleResolverUpdateType == Reset);
|
| - styleResolver->resetAuthorStyle(treeScope());
|
| - engine->removeFontFaceRules(change.fontFaceRulesToRemove);
|
| - styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets);
|
| - styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorStyleSheets());
|
| - } else {
|
| - styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets.size(), collection.activeAuthorStyleSheets());
|
| - }
|
| - }
|
| - if (change.requiresFullStyleRecalc)
|
| - document().setNeedsStyleRecalc(SubtreeStyleChange);
|
| + // TODO(esprehn): This is terrible and not needed in Sky, we should mark
|
| + // specific tree scopes dirty instead.
|
| + document().setNeedsStyleRecalc(SubtreeStyleChange);
|
|
|
| collection.swap(*this);
|
|
|
|
|