Rename LayoutStyle to papayawhip

Source/core/css/resolver/StyleAdjuster.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 26 matching lines @@
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTableCellElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/layout/LayoutReplaced.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/style/GridPosition.h"
-#include "core/layout/style/LayoutStyle.h"
-#include "core/layout/style/LayoutStyleConstants.h"
+#include "core/layout/style/ComputedStyle.h"
+#include "core/layout/style/ComputedStyleConstants.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/Length.h"
 #include "platform/transforms/TransformOperations.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool strictParsing)
@@ skipping 35 matching lines @@
         ASSERT_NOT_REACHED();
         return NONE;
     }
     ASSERT_NOT_REACHED();
     return BLOCK;
 }
 
 // CSS requires text-decoration to be reset at each DOM element for tables,
 // inline blocks, inline tables, shadow DOM crossings, floating elements,
 // and absolute or relatively positioned elements.
-static bool doesNotInheritTextDecoration(const LayoutStyle& style, const Element* e)
+static bool doesNotInheritTextDecoration(const ComputedStyle& style, const Element* e)
 {
     return style.display() == TABLE || style.display() == INLINE_TABLE
         || style.display() == INLINE_BLOCK || style.display() == INLINE_BOX || isAtShadowBoundary(e)
         || style.isFloating() || style.hasOutOfFlowPosition();
 }
 
 // FIXME: This helper is only needed because pseudoStyleForElement passes a null
-// element to adjustLayoutStyle, so we can't just use element->isInTopLayer().
-static bool isInTopLayer(const Element* element, const LayoutStyle& style)
+// element to adjustComputedStyle, so we can't just use element->isInTopLayer().
+static bool isInTopLayer(const Element* element, const ComputedStyle& style)
 {
     return (element && element->isInTopLayer()) || style.styleType() == BACKDROP;
 }
 
-static bool parentStyleForcesZIndexToCreateStackingContext(const LayoutStyle& parentStyle)
+static bool parentStyleForcesZIndexToCreateStackingContext(const ComputedStyle& parentStyle)
 {
     return parentStyle.isDisplayFlexibleOrGridBox();
 }
 
-static bool hasWillChangeThatCreatesStackingContext(const LayoutStyle& style)
+static bool hasWillChangeThatCreatesStackingContext(const ComputedStyle& style)
 {
     for (size_t i = 0; i < style.willChangeProperties().size(); ++i) {
         switch (style.willChangeProperties()[i]) {
         case CSSPropertyOpacity:
         case CSSPropertyTransform:
         case CSSPropertyWebkitTransform:
         case CSSPropertyTransformStyle:
         case CSSPropertyWebkitTransformStyle:
         case CSSPropertyPerspective:
         case CSSPropertyWebkitPerspective:
@@ skipping 10 matching lines @@
             if (RuntimeEnabledFeatures::cssCompositingEnabled())
                 return true;
             break;
         default:
             break;
         }
     }
     return false;
 }
 
-void StyleAdjuster::adjustLayoutStyle(LayoutStyle& style, const LayoutStyle& parentStyle, Element *e, const AuthorStyleInfo& authorStyle)
+void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyle& parentStyle, Element *e, const AuthorStyleInfo& authorStyle)
 {
     if (style.display() != NONE) {
         if (e && e->isHTMLElement())
             adjustStyleForHTMLElement(style, parentStyle, toHTMLElement(*e));
 
         // Per the spec, position 'static' and 'relative' in the top layer compute to 'absolute'.
         if (isInTopLayer(e, style) && (style.position() == StaticPosition || style.position() == RelativePosition))
             style.setPosition(AbsolutePosition);
 
         // Absolute/fixed positioned elements, floating elements and the document element need block-like outside display.
@@ skipping 59 matching lines @@
 
     // FIXME: when dropping the -webkit prefix on transform-style, we should also have opacity < 1 cause flattening.
     if (style.preserves3D() && (style.overflowX() != OVISIBLE
         || style.overflowY() != OVISIBLE
         || style.hasFilter()))
         style.setTransformStyle3D(TransformStyle3DFlat);
 
     if (e && e->isSVGElement()) {
         // Only the root <svg> element in an SVG document fragment tree honors css position
         if (!(isSVGSVGElement(*e) && e->parentNode() && !e->parentNode()->isSVGElement()))
-            style.setPosition(LayoutStyle::initialPosition());
+            style.setPosition(ComputedStyle::initialPosition());
 
         // SVG text layout code expects us to be a block-level style element.
         if ((isSVGForeignObjectElement(*e) || isSVGTextElement(*e)) && style.isDisplayInlineType())
             style.setDisplay(BLOCK);
 
         // Columns don't apply to svg text elements.
         if (isSVGTextElement(*e))
             style.clearMultiCol();
     }
     adjustStyleForAlignment(style, parentStyle);
 }
 
-void StyleAdjuster::adjustStyleForFirstLetter(LayoutStyle& style)
+void StyleAdjuster::adjustStyleForFirstLetter(ComputedStyle& style)
 {
     if (style.styleType() != FIRST_LETTER)
         return;
 
     // Force inline display (except for floating first-letters).
     style.setDisplay(style.isFloating() ? BLOCK : INLINE);
 
     // CSS2 says first-letter can't be positioned.
     style.setPosition(StaticPosition);
 }
 
-void StyleAdjuster::adjustStyleForAlignment(LayoutStyle& style, const LayoutStyle& parentStyle)
+void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style, const ComputedStyle& parentStyle)
 {
     bool isFlexOrGrid = style.isDisplayFlexibleOrGridBox();
     bool absolutePositioned = style.position() == AbsolutePosition;
 
     // If the inherited value of justify-items includes the legacy keyword, 'auto'
     // computes to the the inherited value.
     // Otherwise, auto computes to:
     //  - 'stretch' for flex containers and grid containers.
     //  - 'start' for everything else.
     if (style.justifyItems() == ItemPositionAuto) {
@@ skipping 57 matching lines @@
     if (style.alignContent() == ContentPositionAuto && style.alignContentDistribution() == ContentDistributionDefault) {
         if (style.isDisplayFlexibleOrGridBox()) {
             if (style.isDisplayFlexibleBox())
                 style.setAlignContentDistribution(ContentDistributionStretch);
             else
                 style.setAlignContent(ContentPositionStart);
         }
     }
 }
 
-void StyleAdjuster::adjustStyleForHTMLElement(LayoutStyle& style, const LayoutStyle& parentStyle, HTMLElement& element)
+void StyleAdjuster::adjustStyleForHTMLElement(ComputedStyle& style, const ComputedStyle& parentStyle, HTMLElement& element)
 {
     // <div> and <span> are the most common elements on the web, we skip all the work for them.
     if (isHTMLDivElement(element) || isHTMLSpanElement(element))
         return;
 
     if (isHTMLTableCellElement(element)) {
         // If we have a <td> that specifies a float property, in quirks mode we just drop the float property.
         // FIXME: Why is this only <td> and not <th>?
         if (element.hasTagName(tdTag) && m_useQuirksModeStyles) {
             style.setDisplay(TABLE_CELL);
@@ skipping 69 matching lines @@
             if (style.width().isAuto())
                 style.setWidth(Length(LayoutReplaced::defaultWidth, Fixed));
             if (style.height().isAuto())
                 style.setHeight(Length(LayoutReplaced::defaultHeight, Fixed));
         }
 
         return;
     }
 }
 
-void StyleAdjuster::adjustOverflow(LayoutStyle& style)
+void StyleAdjuster::adjustOverflow(ComputedStyle& style)
 {
     ASSERT(style.overflowX() != OVISIBLE || style.overflowY() != OVISIBLE);
 
     // If either overflow value is not visible, change to auto.
     if (style.overflowX() == OVISIBLE && style.overflowY() != OVISIBLE) {
         // FIXME: Once we implement pagination controls, overflow-x should default to hidden
         // if overflow-y is set to -webkit-paged-x or -webkit-page-y. For now, we'll let it
         // default to auto so we can at least scroll through the pages.
         style.setOverflowX(OAUTO);
     } else if (style.overflowY() == OVISIBLE && style.overflowX() != OVISIBLE) {
@@ skipping 10 matching lines @@
             style.setOverflowY(OVISIBLE);
     }
 
     // Menulists should have visible overflow
     if (style.appearance() == MenulistPart) {
         style.setOverflowX(OVISIBLE);
         style.setOverflowY(OVISIBLE);
     }
 }
 
-void StyleAdjuster::adjustStyleForDisplay(LayoutStyle& style, const LayoutStyle& parentStyle)
+void StyleAdjuster::adjustStyleForDisplay(ComputedStyle& style, const ComputedStyle& parentStyle)
 {
     if (style.display() == BLOCK && !style.isFloating())
         return;
 
     // FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely
     // clear how that should work.
     if (style.display() == INLINE && style.styleType() == NOPSEUDO && style.writingMode() != parentStyle.writingMode())
         style.setDisplay(INLINE_BLOCK);
 
     // After performing the display mutation, check table rows. We do not honor position: relative table rows or cells.
@@ skipping 17 matching lines @@
     if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))
         style.setWritingMode(TopToBottomWritingMode);
 
     if (parentStyle.isDisplayFlexibleOrGridBox()) {
         style.setFloating(NoFloat);
         style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloating(), !m_useQuirksModeStyles));
     }
 }
 
 }