Get rid of ensureStyleResolver().

sky/engine/core/css/FontFaceSet.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 322 matching lines @@
     if (!fontFace) {
         exceptionState.throwTypeError("The argument is not a FontFace.");
         return false;
     }
     return m_nonCSSConnectedFaces.contains(fontFace) || isCSSConnectedFontFace(fontFace);
 }
 
 const ListHashSet<RefPtr<FontFace> >& FontFaceSet::cssConnectedFontFaceList() const
 {
     Document* d = document();
-    d->ensureStyleResolver(); // Flush pending style changes.
     return d->styleEngine()->fontSelector()->fontFaceCache()->cssConnectedFontFaces();
 }
 
 bool FontFaceSet::isCSSConnectedFontFace(FontFace* fontFace) const
 {
     return cssConnectedFontFaceList().contains(fontFace);
 }
 
 void FontFaceSet::forEach(PassOwnPtr<FontFaceSetForEachCallback> callback, const ScriptValue& thisArg) const
 {
@@ skipping 166 matching lines @@
     // Now map the font property longhands into the style.
     CSSPropertyValue properties[] = {
         CSSPropertyValue(CSSPropertyFontFamily, *parsedStyle),
         CSSPropertyValue(CSSPropertyFontStretch, *parsedStyle),
         CSSPropertyValue(CSSPropertyFontStyle, *parsedStyle),
         CSSPropertyValue(CSSPropertyFontVariant, *parsedStyle),
         CSSPropertyValue(CSSPropertyFontWeight, *parsedStyle),
         CSSPropertyValue(CSSPropertyFontSize, *parsedStyle),
         CSSPropertyValue(CSSPropertyLineHeight, *parsedStyle),
     };
-    StyleResolver& styleResolver = document()->ensureStyleResolver();
+    StyleResolver& styleResolver = document()->styleResolver();
     styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties), style.get());
 
     font = style->font();
     font.update(document()->styleEngine()->fontSelector());
     return true;
 }
 
 void FontFaceSet::FontLoadHistogram::updateStatus(FontFace* fontFace)
 {
     if (m_status == Reported)
@@ skipping 32 matching lines @@
     return fonts.release();
 }
 
 void FontFaceSet::didLayout(Document& document)
 {
     if (FontFaceSet* fonts = static_cast<FontFaceSet*>(SupplementType::from(document, supplementName())))
         fonts->didLayout();
 }
 
 } // namespace blink