Improve RAII of StyleResolverState.

Source/core/css/resolver/StyleResolverState.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 27 matching lines @@
 
 namespace blink {
 
 class CSSAnimationUpdate;
 class FontDescription;
 
 class StyleResolverState {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(StyleResolverState);
 public:
-    StyleResolverState(Document&, Element*, RenderStyle* parentStyle = 0);
+    StyleResolverState(const ElementResolveContext&);
+    StyleResolverState(Document&, Element*, PassRefPtr<RenderStyle>, RenderStyle* parentStyle = nullptr);
     ~StyleResolverState();
 
-    // In FontFaceSet and CanvasRenderingContext2D, we don't have an element to grab the document from.
-    // This is why we have to store the document separately.
-    Document& document() const { return *m_document; }
+    static PassRefPtr<RenderStyle> defaultStyleForElement(Document&);
+
     // These are all just pass-through methods to ElementResolveContext.
+    Document& document() const { return m_elementContext.document(); }
     Element* element() const { return m_elementContext.element(); }
     const ContainerNode* parentNode() const { return m_elementContext.parentNode(); }
     const RenderStyle* rootElementStyle() const { return m_elementContext.rootElementStyle(); }
     EInsideLink elementLinkState() const { return m_elementContext.elementLinkState(); }
     bool distributedToInsertionPoint() const { return m_elementContext.distributedToInsertionPoint(); }
 
     const ElementResolveContext& elementContext() const { return m_elementContext; }
 
-    void setStyle(PassRefPtr<RenderStyle> style)
-    {
-        m_style = style;
-        m_cssToLengthConversionData.setStyle(m_style.get());
-        m_fontBuilder.setStyle(m_style.get());
-    }
     const RenderStyle* style() const { return m_style.get(); }
     RenderStyle* style() { return m_style.get(); }
     PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); }
 
     const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
 
     void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
     const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get(); }
     PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
 
-    void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = parentStyle; }
     const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
     RenderStyle* parentStyle() { return m_parentStyle.get(); }
 
     // FIXME: These are effectively side-channel "out parameters" for the various
     // map functions. When we map from CSS to style objects we use this state object
     // to track various meta-data about that mapping (e.g. if it's cache-able).
     // We need to move this data off of StyleResolverState and closer to the
     // objects it applies to. Possibly separating (immutable) inputs from (mutable) outputs.
     void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegularStyle = isApply; }
     void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVisitedLinkStyle = isApply; }
     bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
     bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
 
     // Holds all attribute names found while applying "content" properties that contain an "attr()" value.
     Vector<AtomicString>& contentAttrValues() { return m_contentAttrValues; }
 
-    void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
-    CSSValue* lineHeightValue() { return m_lineHeightValue; }
-
     void cacheUserAgentBorderAndBackground()
     {
         // RenderTheme only needs the cached style if it has an appearance,
         // and constructing it is expensive so we avoid it if possible.
         if (!style()->hasAppearance())
             return;
 
         m_cachedUAStyle = CachedUAStyle::create(style());
     }
 
@@ skipping 21 matching lines @@
     // want to design a better wrapper around RenderStyle for tracking these mutations
     // and separate it from StyleResolverState.
     const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
     void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZoom(f)); }
     void setEffectiveZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setEffectiveZoom(f)); }
     void setWritingMode(WritingMode writingMode) { m_fontBuilder.didChangeFontParameters(m_style->setWritingMode(writingMode)); }
     void setTextOrientation(TextOrientation textOrientation) { m_fontBuilder.didChangeFontParameters(m_style->setTextOrientation(textOrientation)); }
 
 private:
     ElementResolveContext m_elementContext;
-    RawPtrWillBeMember<Document> m_document;
 
     // m_style is the primary output for each element's style resolve.
     RefPtr<RenderStyle> m_style;
 
     CSSToLengthConversionData m_cssToLengthConversionData;
 
     // m_parentStyle is not always just element->parentNode()->style()
     // so we keep it separate from m_elementContext.
     RefPtr<RenderStyle> m_parentStyle;
 
     OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
 
     bool m_applyPropertyToRegularStyle;
     bool m_applyPropertyToVisitedLinkStyle;
 
-    RawPtrWillBeMember<CSSValue> m_lineHeightValue;
-
     FontBuilder m_fontBuilder;
 
     OwnPtr<CachedUAStyle> m_cachedUAStyle;
 
     ElementStyleResources m_elementStyleResources;
     // CSSToStyleMap is a pure-logic class and only contains
     // a back-pointer to this object.
     CSSToStyleMap m_styleMap;
     Vector<AtomicString> m_contentAttrValues;
 };
 
 } // namespace blink
 
 #endif // StyleResolverState_h