Clear StyleResolverState after each resolve.

Source/core/css/FontLoader.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 294 matching lines @@
     if (!resolveFontStyle(fontString, font))
         return false;
     for (const FontFamily* f = &font.family(); f; f = f->next()) {
         CSSSegmentedFontFace* face = m_document->styleResolver()->fontSelector()->getFontFace(font.fontDescription(), f->family());
         if (!face || !face->checkFont())
             return false;
     }
     return true;
 }
 
-static void applyPropertyToCurrentStyle(StyleResolver* styleResolver, CSSPropertyID id, const RefPtr<StylePropertySet>& parsedStyle)
-{
-    styleResolver->applyPropertyToCurrentStyle(id, parsedStyle->getPropertyCSSValue(id).get());
-}
-
 bool FontLoader::resolveFontStyle(const String& fontString, Font& font)
 {
     // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
     RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::create();
     CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, fontString, true, CSSStrictMode, 0);
     if (parsedStyle->isEmpty())
         return false;
 
     String fontValue = parsedStyle->getPropertyValue(CSSPropertyFont);
     if (fontValue == "inherit" || fontValue == "initial")
         return false;
 
     RefPtr<RenderStyle> style = RenderStyle::create();
 
     FontFamily fontFamily;
     fontFamily.setFamily(defaultFontFamily);
 
     FontDescription defaultFontDescription;
     defaultFontDescription.setFamily(fontFamily);
     defaultFontDescription.setSpecifiedSize(defaultFontSize);
     defaultFontDescription.setComputedSize(defaultFontSize);
 
     style->setFontDescription(defaultFontDescription);
 
     style->font().update(style->font().fontSelector());
 
     // Now map the font property longhands into the style.
+    StyleResolver::PropertyValue properties[] = {
+        StyleResolver::PropertyValue(CSSPropertyFontFamily, *parsedStyle),
+        StyleResolver::PropertyValue(CSSPropertyFontStyle, *parsedStyle),
+        StyleResolver::PropertyValue(CSSPropertyFontVariant, *parsedStyle),
+        StyleResolver::PropertyValue(CSSPropertyFontWeight, *parsedStyle),
+        StyleResolver::PropertyValue(CSSPropertyFontSize, *parsedStyle),
+        StyleResolver::PropertyValue(CSSPropertyLineHeight, *parsedStyle),
+    };
     StyleResolver* styleResolver = m_document->styleResolver();
-    styleResolver->applyPropertyToStyle(CSSPropertyFontFamily, parsedStyle->getPropertyCSSValue(CSSPropertyFontFamily).get(), style.get());
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontStyle, parsedStyle);
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontVariant, parsedStyle);
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontWeight, parsedStyle);
-
-    // As described in BUG66291, setting font-size and line-height on a font may entail a CSSPrimitiveValue::computeLengthDouble call,
-    // which assumes the fontMetrics are available for the affected font, otherwise a crash occurs (see http://trac.webkit.org/changeset/96122).
-    // The updateFont() calls below update the fontMetrics and ensure the proper setting of font-size and line-height.
-    styleResolver->updateFont();
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyFontSize, parsedStyle);
-    styleResolver->updateFont();
-    applyPropertyToCurrentStyle(styleResolver, CSSPropertyLineHeight, parsedStyle);
+    styleResolver->applyPropertiesToStyle(properties, arraysize(properties), style.get());
 
     font = style->font();
     font.update(styleResolver->fontSelector());
     return true;
 }
 
 void FontLoader::FontLoadHistogram::record()
 {
     if (m_recorded)
         return;
     m_recorded = true;
     HistogramSupport::histogramCustomCounts("WebFont.WebFontsInPage", m_count, 1, 100, 50);
 }
 
 } // namespace WebCore