Revert 190605 "Make RenderObject::style() return a const object"

trunk/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&, const ElementResolveContext&, const LayoutStyle* parentStyle);
-    StyleResolverState(Document&, Element*, const LayoutStyle* parentStyle = 0);
+    StyleResolverState(Document&, const ElementResolveContext&, LayoutStyle* parentStyle);
+    StyleResolverState(Document&, Element*, LayoutStyle* parentStyle = 0);
     ~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; }
     // These are all just pass-through methods to ElementResolveContext.
     Element* element() const { return m_elementContext.element(); }
     const ContainerNode* parentNode() const { return m_elementContext.parentNode(); }
     const LayoutStyle* rootElementStyle() const { return m_elementContext.rootElementStyle(); }
     EInsideLink elementLinkState() const { return m_elementContext.elementLinkState(); }
@@ skipping 16 matching lines @@
 
     const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
 
     void setConversionFontSizes(const CSSToLengthConversionData::FontSizes& fontSizes) { m_cssToLengthConversionData.setFontSizes(fontSizes); }
     void setConversionZoom(float zoom) { m_cssToLengthConversionData.setZoom(zoom); }
 
     void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
     const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get(); }
     PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
 
-    void setParentStyle(PassRefPtr<LayoutStyle> parentStyle) { m_overrideParentStyle = parentStyle; }
-    const LayoutStyle* parentStyle() const
-    {
-        if (m_overrideParentStyle)
-            return m_overrideParentStyle.get();
-        return m_parentStyle;
-    }
+    void setParentStyle(PassRefPtr<LayoutStyle> parentStyle) { m_parentStyle = parentStyle; }
+    const LayoutStyle* parentStyle() const { return m_parentStyle.get(); }
+    LayoutStyle* 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; }
@@ skipping 22 matching lines @@
     {
         return m_elementStyleResources.styleImage(document(), document().textLinkColors(), style()->color(), propertyId, value);
     }
 
     FontBuilder& fontBuilder() { return m_fontBuilder; }
     // FIXME: These exist as a primitive way to track mutations to font-related properties
     // on a LayoutStyle. As designed, these are very error-prone, as some callers
     // set these directly on the LayoutStyle w/o telling us. Presumably we'll
     // want to design a better wrapper around LayoutStyle for tracking these mutations
     // and separate it from StyleResolverState.
-    const FontDescription& parentFontDescription() { return parentStyle()->fontDescription(); }
+    const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
 
     void setZoom(float f)
     {
         if (m_style->setZoom(f))
             m_fontBuilder.didChangeEffectiveZoom();
     }
     void setEffectiveZoom(float f)
     {
         if (m_style->setEffectiveZoom(f))
             m_fontBuilder.didChangeEffectiveZoom();
@@ skipping 13 matching lines @@
     ElementResolveContext m_elementContext;
     RawPtrWillBeMember<Document> m_document;
 
     // m_style is the primary output for each element's style resolve.
     RefPtr<LayoutStyle> m_style;
 
     CSSToLengthConversionData m_cssToLengthConversionData;
 
     // m_parentStyle is not always just ElementResolveContext::parentStyle,
     // so we keep it separate.
-    const LayoutStyle* m_parentStyle;
-    RefPtr<LayoutStyle> m_overrideParentStyle;
+    RefPtr<LayoutStyle> m_parentStyle;
 
     OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
 
     bool m_applyPropertyToRegularStyle;
     bool m_applyPropertyToVisitedLinkStyle;
 
     FontBuilder m_fontBuilder;
 
     OwnPtr<CachedUAStyle> m_cachedUAStyle;
 
     ElementStyleResources m_elementStyleResources;
 };
 
 } // namespace blink
 
 #endif // StyleResolverState_h