Get rid of ensureStyleResolver().

sky/engine/core/dom/Document.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, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 1043 matching lines @@
 
 void Document::updateStyle(StyleRecalcChange change)
 {
     TRACE_EVENT0("blink", "Document::updateStyle");
 
     m_lifecycle.advanceTo(DocumentLifecycle::InStyleRecalc);
 
     if (styleChangeType() >= SubtreeStyleChange)
         change = Force;
 
-    // FIXME: Cannot access the ensureStyleResolver() before calling styleForDocument below because
+    // FIXME: Cannot access the styleResolver() before calling styleForDocument below because
     // apparently the StyleResolver's constructor has side effects. We should fix it.
     // See printing/setPrinting.html, printing/width-overflow.html though they only fail on
     // mac when accessing the resolver by what appears to be a viewport size difference.
 
     if (change == Force) {
         RefPtr<RenderStyle> documentStyle = StyleResolver::styleForDocument(*this);
         StyleRecalcChange localChange = RenderStyle::stylePropagationDiff(documentStyle.get(), renderView()->style());
         if (localChange != NoChange)
             renderView()->setStyle(documentStyle.release());
     }
 
     clearNeedsStyleRecalc();
 
     // Uncomment to enable printing of statistics about style sharing and the matched property cache.
     // Optionally pass StyleResolver::ReportSlowStats to print numbers that require crawling the
     // entire DOM (where collecting them is very slow).
     // FIXME: Expose this as a runtime flag.
-    // ensureStyleResolver().enableStats(/*StyleResolver::ReportSlowStats*/);
+    // styleResolver().enableStats(/*StyleResolver::ReportSlowStats*/);
 
-    if (StyleResolverStats* stats = ensureStyleResolver().stats())
+    if (StyleResolverStats* stats = styleResolver().stats())
         stats->reset();
 
     if (Element* documentElement = this->documentElement()) {
         if (documentElement->shouldCallRecalcStyle(change))
             documentElement->recalcStyle(change);
     }
 
-    ensureStyleResolver().printStats();
+    styleResolver().printStats();
 
     view()->recalcOverflowAfterStyleChange();
 
     clearChildNeedsStyleRecalc();
 
     m_styleEngine->resolver().clearStyleSharingList();
 
     ASSERT(!needsStyleRecalc());
     ASSERT(!childNeedsStyleRecalc());
     ASSERT(inStyleRecalc());
@@ skipping 49 matching lines @@
 
 void Document::clearFocusedElementTimerFired(Timer<Document>*)
 {
     updateRenderTreeIfNeeded();
     m_clearFocusedElementTimer.stop();
 
     if (m_focusedElement && !m_focusedElement->isFocusable())
         m_focusedElement->blur();
 }
 
-StyleResolver* Document::styleResolver() const
-{
-    if (!isActive())
-        return 0;
-    return &m_styleEngine->resolver();
-}
-
-StyleResolver& Document::ensureStyleResolver() const
+StyleResolver& Document::styleResolver() const
 {
     ASSERT(isActive());
     return m_styleEngine->resolver();
 }
 
 void Document::attach(const AttachContext& context)
 {
     ASSERT(m_lifecycle.state() == DocumentLifecycle::Inactive);
 
     m_styleEngine = StyleEngine::create(*this);
@@ skipping 397 matching lines @@
     if (m_mediaQueryMatcher)
         m_mediaQueryMatcher->mediaFeaturesChanged();
 }
 
 void Document::notifyResizeForViewportUnits()
 {
     if (m_mediaQueryMatcher)
         m_mediaQueryMatcher->viewportChanged();
     if (!hasViewportUnits())
         return;
-    ensureStyleResolver().notifyResizeForViewportUnits();
+    styleResolver().notifyResizeForViewportUnits();
     setNeedsStyleRecalcForViewportUnits();
 }
 
 void Document::styleResolverChanged()
 {
     // styleResolverChanged() can be invoked during Document destruction.
     // We just skip that case.
     if (!m_styleEngine)
         return;
     m_styleEngine->resolverChanged();
@@ skipping 1040 matching lines @@
 using namespace blink;
 void showLiveDocumentInstances()
 {
     WeakDocumentSet& set = liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it) {
         fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().utf8().data());
     }
 }
 #endif