Rename LayoutStyle to papayawhip

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 15 matching lines @@
 
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/resolver/CSSToStyleMap.h"
 #include "core/css/resolver/ElementResolveContext.h"
 #include "core/css/resolver/ElementStyleResources.h"
 #include "core/css/resolver/FontBuilder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/layout/style/CachedUAStyle.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "core/layout/style/StyleInheritedData.h"
 
 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&, const ComputedStyle* parentStyle);
+    StyleResolverState(Document&, Element*, const ComputedStyle* 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(); }
+    const ComputedStyle* 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<LayoutStyle> style)
+    void setStyle(PassRefPtr<ComputedStyle> style)
     {
         // FIXME: Improve RAII of StyleResolverState to remove this function.
         m_style = style;
         m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), rootElementStyle(), document().layoutView(), m_style->effectiveZoom());
     }
-    const LayoutStyle* style() const { return m_style.get(); }
-    LayoutStyle* style() { return m_style.get(); }
-    PassRefPtr<LayoutStyle> takeStyle() { return m_style.release(); }
+    const ComputedStyle* style() const { return m_style.get(); }
+    ComputedStyle* style() { return m_style.get(); }
+    PassRefPtr<ComputedStyle> takeStyle() { return m_style.release(); }
 
-    LayoutStyle& mutableStyleRef() const { return *m_style; }
-    const LayoutStyle& styleRef() const { return mutableStyleRef(); }
+    ComputedStyle& mutableStyleRef() const { return *m_style; }
+    const ComputedStyle& styleRef() const { return mutableStyleRef(); }
 
     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_parentStyle = parentStyle; }
-    const LayoutStyle* parentStyle() const { return m_parentStyle.get(); }
-    LayoutStyle* parentStyle() { return m_parentStyle.get(); }
+    void setParentStyle(PassRefPtr<ComputedStyle> parentStyle) { m_parentStyle = parentStyle; }
+    const ComputedStyle* parentStyle() const { return m_parentStyle.get(); }
+    ComputedStyle* 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 18 matching lines @@
     // FIXME: Once styleImage can be made to not take a StyleResolverState
     // this convenience function should be removed. As-is, without this, call
     // sites are extremely verbose.
     PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value)
     {
         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
+    // on a ComputedStyle. As designed, these are very error-prone, as some callers
+    // set these directly on the ComputedStyle w/o telling us. Presumably we'll
+    // want to design a better wrapper around ComputedStyle for tracking these mutations
     // and separate it from StyleResolverState.
     const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
 
     void setZoom(float f)
     {
         if (m_style->setZoom(f))
             m_fontBuilder.didChangeEffectiveZoom();
     }
     void setEffectiveZoom(float f)
     {
@@ skipping 12 matching lines @@
     }
 
     void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; }
     bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; }
 
 private:
     ElementResolveContext m_elementContext;
     RawPtrWillBeMember<Document> m_document;
 
     // m_style is the primary output for each element's style resolve.
-    RefPtr<LayoutStyle> m_style;
+    RefPtr<ComputedStyle> m_style;
 
     CSSToLengthConversionData m_cssToLengthConversionData;
 
     // m_parentStyle is not always just ElementResolveContext::parentStyle,
     // so we keep it separate.
-    RefPtr<LayoutStyle> m_parentStyle;
+    RefPtr<ComputedStyle> m_parentStyle;
 
     OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
 
     bool m_applyPropertyToRegularStyle;
     bool m_applyPropertyToVisitedLinkStyle;
     bool m_hasDirAutoAttribute;
 
     FontBuilder m_fontBuilder;
 
     OwnPtr<CachedUAStyle> m_cachedUAStyle;
 
     ElementStyleResources m_elementStyleResources;
 };
 
 } // namespace blink
 
 #endif // StyleResolverState_h