Rename LayoutStyle to papayawhip

Source/core/layout/svg/SVGLayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
  *           (C) 2005 Rob Buis <buis@kde.org>
  *           (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 252 matching lines @@
     else if (paintServerContainer->resourceType() == LinearGradientResourceType)
         ts << "[type=LINEAR-GRADIENT]";
     else if (paintServerContainer->resourceType() == RadialGradientResourceType)
         ts << "[type=RADIAL-GRADIENT]";
 
     ts << " [id=\"" << element->getIdAttribute() << "\"]";
 }
 
 static void writeStyle(TextStream& ts, const LayoutObject& object)
 {
-    const LayoutStyle& style = object.styleRef();
-    const SVGLayoutStyle& svgStyle = style.svgStyle();
+    const ComputedStyle& style = object.styleRef();
+    const SVGComputedStyle& svgStyle = style.svgStyle();
 
     if (!object.localTransform().isIdentity())
         writeNameValuePair(ts, "transform", object.localTransform());
-    writeIfNotDefault(ts, "image rendering", style.imageRendering(), LayoutStyle::initialImageRendering());
-    writeIfNotDefault(ts, "opacity", style.opacity(), LayoutStyle::initialOpacity());
+    writeIfNotDefault(ts, "image rendering", style.imageRendering(), ComputedStyle::initialImageRendering());
+    writeIfNotDefault(ts, "opacity", style.opacity(), ComputedStyle::initialOpacity());
     if (object.isSVGShape()) {
         const LayoutSVGShape& shape = static_cast<const LayoutSVGShape&>(object);
         ASSERT(shape.element());
 
         SVGPaintDescription strokePaintDescription = LayoutSVGResourcePaintServer::requestPaintDescription(shape, shape.styleRef(), ApplyToStrokeMode);
         if (strokePaintDescription.isValid) {
             TextStreamSeparator s(" ");
             ts << " [stroke={" << s;
             writeSVGPaintingResource(ts, strokePaintDescription);
 
@@ skipping 104 matching lines @@
 }
 
 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textBox, int indent)
 {
     Vector<SVGTextFragment>& fragments = textBox->textFragments();
     if (fragments.isEmpty())
         return;
 
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(textBox->layoutObject());
 
-    const SVGLayoutStyle& svgStyle = textLayoutObject.style()->svgStyle();
+    const SVGComputedStyle& svgStyle = textLayoutObject.style()->svgStyle();
     String text = textBox->layoutObject().text();
 
     unsigned fragmentsSize = fragments.size();
     for (unsigned i = 0; i < fragmentsSize; ++i) {
         SVGTextFragment& fragment = fragments.at(i);
         writeIndent(ts, indent + 1);
 
         unsigned startOffset = fragment.characterOffset;
         unsigned endOffset = fragment.characterOffset + fragment.length;
 
@@ skipping 215 matching lines @@
 
     SVGStopElement* stopElement = toSVGStopElement(stop.node());
     ASSERT(stopElement);
     ASSERT(stop.style());
 
     ts << " [offset=" << stopElement->offset()->currentValue()->value() << "] [color=" << stopElement->stopColorIncludingOpacity() << "]\n";
 }
 
 void writeResources(TextStream& ts, const LayoutObject& object, int indent)
 {
-    const LayoutStyle& style = object.styleRef();
-    const SVGLayoutStyle& svgStyle = style.svgStyle();
+    const ComputedStyle& style = object.styleRef();
+    const SVGComputedStyle& svgStyle = style.svgStyle();
 
     // FIXME: We want to use SVGResourcesCache to determine which resources are present, instead of quering the resource <-> id cache.
     // For now leave the DRT output as is, but later on we should change this so cycles are properly ignored in the DRT output.
     LayoutObject& layoutObject = const_cast<LayoutObject&>(object);
     if (!svgStyle.maskerResource().isEmpty()) {
         if (LayoutSVGResourceMasker* masker = getLayoutSVGResourceById<LayoutSVGResourceMasker>(object.document(), svgStyle.maskerResource())) {
             writeIndent(ts, indent);
             ts << " ";
             writeNameAndQuotedValue(ts, "masker", svgStyle.maskerResource());
             ts << " ";
@@ skipping 17 matching lines @@
             ts << " ";
             writeNameAndQuotedValue(ts, "filter", svgStyle.filterResource());
             ts << " ";
             writeStandardPrefix(ts, *filter, 0);
             ts << " " << filter->resourceBoundingBox(&layoutObject) << "\n";
         }
     }
 }
 
 } // namespace blink