Should not override styleResolverUpdateType to Reset when some existing stylesheet still has @font-…

Source/core/dom/StyleSheetCollection.cpp

Index: Source/core/dom/StyleSheetCollection.cpp
diff --git a/Source/core/dom/StyleSheetCollection.cpp b/Source/core/dom/StyleSheetCollection.cpp
index 8613a43a31a19997faaf3af465639dee4c086dc1..ba7adecc0a7b2bdde4de6c3c5bc23866cd0acc5e 100644
--- a/Source/core/dom/StyleSheetCollection.cpp
+++ b/Source/core/dom/StyleSheetCollection.cpp
@@ -200,9 +200,7 @@ void StyleSheetCollection::analyzeStyleSheetChange(StyleResolverUpdateMode updat
             // fontSelector should be always reset. After creating RuleSet for each StyleSheetContents,
             // we can avoid appending all stylesheetcontents in reset case.
             // So we can remove "styleSheetContentsHasFontFaceRule(newSheets)".
-            if (cssStyleSheetHasFontFaceRule(newCollection.activeAuthorStyleSheets()))
-                change.styleResolverUpdateType = ResetStyleResolverAndFontSelector;

[esprehn, 2013/11/22 05:13:35]

Just add an else, the ternary makes this a bit harder to read.

[tasak, 2013/11/22 06:16:40]

I strongly agree. Done. I missed ")".

-            change.styleResolverUpdateType = Reset;
+            change.styleResolverUpdateType = cssStyleSheetHasFontFaceRule(newCollection.activeAuthorStyleSheets() ? ResetStyleResolverAndFontSelector : Reset;
         }
     }