Rename LayoutStyle to papayawhip

Source/core/svg/SVGLengthContext.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/svg/SVGLengthContext.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/layout/LayoutObject.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/LengthFunctions.h"
 #include "platform/fonts/FontMetrics.h"
 
 namespace blink {
 
 static inline float dimensionForLengthMode(SVGLengthMode mode, const FloatSize& viewportSize)
 {
     switch (mode) {
     case SVGLengthMode::Width:
@@ skipping 55 matching lines @@
 
     // FIXME: valueAsPercentage() won't be correct for eg. cm units. They need to be resolved in user space and then be considered in objectBoundingBox space.
     return x.valueAsPercentage();
 }
 
 float SVGLengthContext::valueForLength(const UnzoomedLength& unzoomedLength, SVGLengthMode mode) const
 {
     return valueForLength(unzoomedLength.length(), 1, mode);
 }
 
-float SVGLengthContext::valueForLength(const Length& length, const LayoutStyle& style, SVGLengthMode mode) const
+float SVGLengthContext::valueForLength(const Length& length, const ComputedStyle& style, SVGLengthMode mode) const
 {
     return valueForLength(length, style.effectiveZoom(), mode);
 }
 
 float SVGLengthContext::valueForLength(const Length& length, float zoom, SVGLengthMode mode) const
 {
     float dimension = 0;
     if (length.isPercent()) {
         FloatSize viewportSize;
         determineViewport(viewportSize);
         // The viewport will be unaffected by zoom.
         dimension = dimensionForLengthMode(mode, viewportSize);
     }
     return valueForLength(length, zoom, dimension);
 }
 
-float SVGLengthContext::valueForLength(const Length& length, const LayoutStyle& style, float dimension)
+float SVGLengthContext::valueForLength(const Length& length, const ComputedStyle& style, float dimension)
 {
     return valueForLength(length, style.effectiveZoom(), dimension);
 }
 
 float SVGLengthContext::valueForLength(const Length& length, float zoom, float dimension)
 {
     ASSERT(zoom != 0);
     return floatValueForLength(length, dimension * zoom) / zoom;
 }
 
@@ skipping 76 matching lines @@
     case LengthTypePT:
         return value / cssPixelsPerPoint;
     case LengthTypePC:
         return value / cssPixelsPerPica;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-static inline const LayoutStyle* layoutStyleForLengthResolving(const SVGElement* context)
+static inline const ComputedStyle* computedStyleForLengthResolving(const SVGElement* context)
 {
     if (!context)
         return 0;
 
     const ContainerNode* currentContext = context;
     do {
         if (currentContext->layoutObject())
             return currentContext->layoutObject()->style();
         currentContext = currentContext->parentNode();
     } while (currentContext);
 
     // There must be at least a LayoutSVGRoot renderer, carrying a style.
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 float SVGLengthContext::convertValueFromUserUnitsToEMS(float value) const
 {
-    const LayoutStyle* style = layoutStyleForLengthResolving(m_context);
+    const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     float fontSize = style->specifiedFontSize();
     if (!fontSize)
         return 0;
 
     return value / fontSize;
 }
 
 float SVGLengthContext::convertValueFromEMSToUserUnits(float value) const
 {
-    const LayoutStyle* style = layoutStyleForLengthResolving(m_context);
+    const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
     return value * style->specifiedFontSize();
 }
 
 float SVGLengthContext::convertValueFromUserUnitsToEXS(float value) const
 {
-    const LayoutStyle* style = layoutStyleForLengthResolving(m_context);
+    const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
     // if this causes problems in real world cases maybe it would be best to remove this
     float xHeight = ceilf(style->fontMetrics().xHeight());
     if (!xHeight)
         return 0;
 
     return value / xHeight;
 }
 
 float SVGLengthContext::convertValueFromEXSToUserUnits(float value) const
 {
-    const LayoutStyle* style = layoutStyleForLengthResolving(m_context);
+    const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
     // if this causes problems in real world cases maybe it would be best to remove this
     return value * ceilf(style->fontMetrics().xHeight());
 }
 
 bool SVGLengthContext::determineViewport(FloatSize& viewportSize) const
 {
@@ skipping 13 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }