Rename LayoutStyle to papayawhip

Source/core/layout/LayoutInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
@@ skipping 134 matching lines @@
 static LayoutObject* inFlowPositionedInlineAncestor(LayoutObject* p)
 {
     while (p && p->isLayoutInline()) {
         if (p->isRelPositioned())
             return p;
         p = p->parent();
     }
     return 0;
 }
 
-static void updateStyleOfAnonymousBlockContinuations(LayoutObject* block, const LayoutStyle& newStyle, const LayoutStyle& oldStyle)
+static void updateStyleOfAnonymousBlockContinuations(LayoutObject* block, const ComputedStyle& newStyle, const ComputedStyle& oldStyle)
 {
     for (;block && block->isAnonymousBlock(); block = block->nextSibling()) {
         if (!toLayoutBlock(block)->isAnonymousBlockContinuation())
             continue;
 
-        RefPtr<LayoutStyle> newBlockStyle;
+        RefPtr<ComputedStyle> newBlockStyle;
 
         if (!block->style()->isOutlineEquivalent(&newStyle)) {
-            newBlockStyle = LayoutStyle::clone(block->styleRef());
+            newBlockStyle = ComputedStyle::clone(block->styleRef());
             newBlockStyle->setOutlineFromStyle(newStyle);
         }
 
         if (block->style()->position() != newStyle.position()) {
             // If we are no longer in-flow positioned but our descendant block(s) still have an in-flow positioned ancestor then
             // their containing anonymous block should keep its in-flow positioning.
             if (oldStyle.hasInFlowPosition()
                 && inFlowPositionedInlineAncestor(toLayoutBlock(block)->inlineElementContinuation()))
                 continue;
             if (!newBlockStyle)
-                newBlockStyle = LayoutStyle::clone(block->styleRef());
+                newBlockStyle = ComputedStyle::clone(block->styleRef());
             newBlockStyle->setPosition(newStyle.position());
         }
 
         if (newBlockStyle)
             block->setStyle(newBlockStyle);
     }
 }
 
-void LayoutInline::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutInline::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     LayoutBoxModelObject::styleDidChange(diff, oldStyle);
 
     // Ensure that all of the split inlines pick up the new style. We
     // only do this if we're an inline, since we don't want to propagate
     // a block's style to the other inlines.
     // e.g., <font>foo <h4>goo</h4> moo</font>.  The <font> inlines before
     // and after the block share the same style, but the block doesn't
     // need to pass its style on to anyone else.
-    const LayoutStyle& newStyle = styleRef();
+    const ComputedStyle& newStyle = styleRef();
     LayoutInline* continuation = inlineElementContinuation();
     for (LayoutInline* currCont = continuation; currCont; currCont = currCont->inlineElementContinuation()) {
         LayoutBoxModelObject* nextCont = currCont->continuation();
         currCont->setContinuation(0);
         currCont->setStyle(style());
         currCont->setContinuation(nextCont);
     }
 
     // If an inline's outline or in-flow positioning has changed then any descendant blocks will need to change their styles accordingly.
     // Do this by updating the styles of the descendant blocks' containing anonymous blocks - there may be more than one.
@@ skipping 16 matching lines @@
     }
 }
 
 void LayoutInline::updateAlwaysCreateLineBoxes(bool fullLayout)
 {
     // Once we have been tainted once, just assume it will happen again. This way effects like hover highlighting that change the
     // background color will only cause a layout on the first rollover.
     if (alwaysCreateLineBoxes())
         return;
 
-    const LayoutStyle& parentStyle = parent()->styleRef();
+    const ComputedStyle& parentStyle = parent()->styleRef();
     LayoutInline* parentLayoutInline = parent()->isLayoutInline() ? toLayoutInline(parent()) : 0;
     bool checkFonts = document().inNoQuirksMode();
     bool alwaysCreateLineBoxesNew = (parentLayoutInline && parentLayoutInline->alwaysCreateLineBoxes())
         || (parentLayoutInline && parentStyle.verticalAlign() != BASELINE)
         || style()->verticalAlign() != BASELINE
         || style()->textEmphasisMark() != TextEmphasisMarkNone
         || (checkFonts && (!parentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(style()->font().fontMetrics())
         || parentStyle.lineHeight() != style()->lineHeight()));
 
     if (!alwaysCreateLineBoxesNew && checkFonts && document().styleEngine().usesFirstLineRules()) {
         // Have to check the first line style as well.
-        const LayoutStyle& firstLineParentStyle = parent()->styleRef(true);
-        const LayoutStyle& childStyle = styleRef(true);
+        const ComputedStyle& firstLineParentStyle = parent()->styleRef(true);
+        const ComputedStyle& childStyle = styleRef(true);
         alwaysCreateLineBoxesNew = !firstLineParentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle.font().fontMetrics())
         || childStyle.verticalAlign() != BASELINE
         || firstLineParentStyle.lineHeight() != childStyle.lineHeight();
     }
 
     if (alwaysCreateLineBoxesNew) {
         if (!fullLayout)
             dirtyLineBoxes(false);
         setAlwaysCreateLineBoxes();
     }
@@ skipping 69 matching lines @@
 {
     // Make sure we don't append things after :after-generated content if we have it.
     if (!beforeChild && isAfterContent(lastChild()))
         beforeChild = lastChild();
 
     if (!newChild->isInline() && !newChild->isFloatingOrOutOfFlowPositioned()) {
         // We are placing a block inside an inline. We have to perform a split of this
         // inline into continuations.  This involves creating an anonymous block box to hold
         // |newChild|.  We then make that block box a continuation of this inline.  We take all of
         // the children after |beforeChild| and put them in a clone of this object.
-        RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay(styleRef(), BLOCK);
+        RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(styleRef(), BLOCK);
 
         // If inside an inline affected by in-flow positioning the block needs to be affected by it too.
         // Giving the block a layer like this allows it to collect the x/y offsets from inline parents later.
         if (LayoutObject* positionedAncestor = inFlowPositionedInlineAncestor(this))
             newStyle->setPosition(positionedAncestor->style()->position());
 
         // Push outline style to the block continuation.
         if (!newStyle->isOutlineEquivalent(style()))
             newStyle->setOutlineFromStyle(*style());
 
@@ skipping 404 matching lines @@
 LayoutUnit LayoutInline::marginTop() const
 {
     return computeMargin(this, style()->marginTop());
 }
 
 LayoutUnit LayoutInline::marginBottom() const
 {
     return computeMargin(this, style()->marginBottom());
 }
 
-LayoutUnit LayoutInline::marginStart(const LayoutStyle* otherStyle) const
+LayoutUnit LayoutInline::marginStart(const ComputedStyle* otherStyle) const
 {
     return computeMargin(this, style()->marginStartUsing(otherStyle ? otherStyle : style()));
 }
 
-LayoutUnit LayoutInline::marginEnd(const LayoutStyle* otherStyle) const
+LayoutUnit LayoutInline::marginEnd(const ComputedStyle* otherStyle) const
 {
     return computeMargin(this, style()->marginEndUsing(otherStyle ? otherStyle : style()));
 }
 
-LayoutUnit LayoutInline::marginBefore(const LayoutStyle* otherStyle) const
+LayoutUnit LayoutInline::marginBefore(const ComputedStyle* otherStyle) const
 {
     return computeMargin(this, style()->marginBeforeUsing(otherStyle ? otherStyle : style()));
 }
 
-LayoutUnit LayoutInline::marginAfter(const LayoutStyle* otherStyle) const
+LayoutUnit LayoutInline::marginAfter(const ComputedStyle* otherStyle) const
 {
     return computeMargin(this, style()->marginAfterUsing(otherStyle ? otherStyle : style()));
 }
 
 const char* LayoutInline::name() const
 {
     if (isRelPositioned())
         return "LayoutInline (relative positioned)";
     if (isAnonymous())
         return "LayoutInline (anonymous)";
@@ skipping 522 matching lines @@
 {
     setAlwaysCreateLineBoxes();
     InlineFlowBox* flowBox = createInlineFlowBox();
     m_lineBoxes.appendLineBox(flowBox);
     return flowBox;
 }
 
 LayoutUnit LayoutInline::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
 {
     if (firstLine && document().styleEngine().usesFirstLineRules()) {
-        const LayoutStyle* s = style(firstLine);
+        const ComputedStyle* s = style(firstLine);
         if (s != style())
             return s->computedLineHeight();
     }
 
     return style()->computedLineHeight();
 }
 
 int LayoutInline::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
 {
     ASSERT(linePositionMode == PositionOnContainingLine);
@@ skipping 127 matching lines @@
 }
 
 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer) const
 {
     LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContainer);
     for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
         paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
 }
 
 } // namespace blink