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

Source/core/dom/StyleSheetCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 182 matching lines @@
             change.styleResolverUpdateType = updateType;
         } else {
             if (styleSheetContentsHasFontFaceRule(addedSheets)) {
                 change.styleResolverUpdateType = ResetStyleResolverAndFontSelector;
                 return;
             }
             // FIXME: since currently all stylesheets are re-added after reseting styleresolver,
             // 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;
         }
     }
 
     // FIXME: If styleResolverUpdateType is still Reconstruct, we could return early here
     // as destroying the StyleResolver will recalc the whole document anyway?
 
     // If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
     if (!document()->body() || document()->hasNodesWithPlaceholderStyle())
         return;
     StyleInvalidationAnalysis invalidationAnalysis(addedSheets);
@@ skipping 26 matching lines @@
     }
     return false;
 }
 
 void StyleSheetCollection::updateUsesRemUnits()
 {
     m_usesRemUnits = styleSheetsUseRemUnits(m_activeAuthorStyleSheets);
 }
 
 }