Chromium Code Reviews| Index: Source/core/dom/DocumentStyleSheetCollection.cpp |
| diff --git a/Source/core/dom/DocumentStyleSheetCollection.cpp b/Source/core/dom/DocumentStyleSheetCollection.cpp |
| index cc0c83222c0fda7cc3a907f942ebf3421ac7f3c8..d9ce1458aba4641af7482277d5c5f898b3bb10eb 100644 |
| --- a/Source/core/dom/DocumentStyleSheetCollection.cpp |
| +++ b/Source/core/dom/DocumentStyleSheetCollection.cpp |
| @@ -165,10 +165,9 @@ bool DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine, |
| // Need to change "false" to some valid condition. |
| styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); |
| if (change.styleResolverUpdateType != Additive) { |
| - ASSERT(change.styleResolverUpdateType == Reset || change.styleResolverUpdateType == ResetStyleResolverAndFontSelector); |
| + ASSERT(change.styleResolverUpdateType == Reset); |
| resetAllRuleSetsInTreeScope(styleResolver); |
| - if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelector) |
| - styleResolver->resetFontSelector(); |
| + styleResolver->removeFontFaceRule(change.removedFontFace); |
|
dglazkov
2013/11/25 16:27:29
I am curious why we couldn't just do extract+remov
tasak
2013/11/26 07:49:06
So is it ok to move removeFontFaceRule to analyzeS
|
| styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets); |
| styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorStyleSheets()); |
| } else { |