Rename LayoutStyle to papayawhip

Source/core/animation/css/CSSPropertyEquality.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/css/CSSPropertyEquality.h"
 
 #include "core/animation/css/CSSAnimations.h"
 #include "core/layout/style/DataEquivalency.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "core/layout/style/ShadowList.h"
 
 namespace blink {
 
 namespace {
 
 template <CSSPropertyID property>
 bool fillLayersEqual(const FillLayer& aLayers, const FillLayer& bLayers)
 {
     const FillLayer* aLayer = &aLayers;
@@ skipping 28 matching lines @@
         aLayer = aLayer->next();
         bLayer = bLayer->next();
     }
 
     // FIXME: Shouldn't this be return !aLayer && !bLayer; ?
     return true;
 }
 
 }
 
-bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const LayoutStyle& a, const LayoutStyle& b)
+bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const ComputedStyle& a, const ComputedStyle& b)
 {
     switch (prop) {
     case CSSPropertyBackgroundColor:
         return a.backgroundColor() == b.backgroundColor()
             && a.visitedLinkBackgroundColor() == b.visitedLinkBackgroundColor();
     case CSSPropertyBackgroundImage:
         return fillLayersEqual<CSSPropertyBackgroundImage>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBackgroundPositionX:
         return fillLayersEqual<CSSPropertyBackgroundPositionX>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBackgroundPositionY:
@@ skipping 40 matching lines @@
         return a.borderTopWidth() == b.borderTopWidth();
     case CSSPropertyBottom:
         return a.bottom() == b.bottom();
     case CSSPropertyBoxShadow:
         return dataEquivalent(a.boxShadow(), b.boxShadow());
     case CSSPropertyClip:
         return a.clip() == b.clip();
     case CSSPropertyColor:
         return a.color() == b.color() && a.visitedLinkColor() == b.visitedLinkColor();
     case CSSPropertyFill: {
-        const SVGLayoutStyle& aSVG = a.svgStyle();
-        const SVGLayoutStyle& bSVG = b.svgStyle();
+        const SVGComputedStyle& aSVG = a.svgStyle();
+        const SVGComputedStyle& bSVG = b.svgStyle();
         return aSVG.fillPaintType() == bSVG.fillPaintType()
             && (aSVG.fillPaintType() != SVG_PAINTTYPE_RGBCOLOR || aSVG.fillPaintColor() == bSVG.fillPaintColor())
             && aSVG.visitedLinkFillPaintType() == bSVG.visitedLinkFillPaintType()
             && (aSVG.visitedLinkFillPaintType() != SVG_PAINTTYPE_RGBCOLOR || aSVG.visitedLinkFillPaintColor() == bSVG.visitedLinkFillPaintColor());
     }
     case CSSPropertyFillOpacity:
         return a.fillOpacity() == b.fillOpacity();
     case CSSPropertyFlexBasis:
         return a.flexBasis() == b.flexBasis();
     case CSSPropertyFlexGrow:
@@ skipping 76 matching lines @@
         return a.shapeImageThreshold() == b.shapeImageThreshold();
     case CSSPropertyShapeMargin:
         return a.shapeMargin() == b.shapeMargin();
     case CSSPropertyShapeOutside:
         return dataEquivalent(a.shapeOutside(), b.shapeOutside());
     case CSSPropertyStopColor:
         return a.stopColor() == b.stopColor();
     case CSSPropertyStopOpacity:
         return a.stopOpacity() == b.stopOpacity();
     case CSSPropertyStroke: {
-        const SVGLayoutStyle& aSVG = a.svgStyle();
-        const SVGLayoutStyle& bSVG = b.svgStyle();
+        const SVGComputedStyle& aSVG = a.svgStyle();
+        const SVGComputedStyle& bSVG = b.svgStyle();
         return aSVG.strokePaintType() == bSVG.strokePaintType()
             && (aSVG.strokePaintType() != SVG_PAINTTYPE_RGBCOLOR || aSVG.strokePaintColor() == bSVG.strokePaintColor())
             && aSVG.visitedLinkStrokePaintType() == bSVG.visitedLinkStrokePaintType()
             && (aSVG.visitedLinkStrokePaintType() != SVG_PAINTTYPE_RGBCOLOR || aSVG.visitedLinkStrokePaintColor() == bSVG.visitedLinkStrokePaintColor());
     }
     case CSSPropertyStrokeDasharray:
         return a.strokeDashArray() == b.strokeDashArray();
     case CSSPropertyStrokeDashoffset:
         return a.strokeDashOffset() == b.strokeDashOffset();
     case CSSPropertyStrokeMiterlimit:
@@ skipping 98 matching lines @@
         return a.svgStyle().ry() == b.svgStyle().ry();
     case CSSPropertyZIndex:
         return a.zIndex() == b.zIndex();
     default:
         ASSERT_NOT_REACHED();
         return true;
     }
 }
 
 }