Rename LayoutStyle to papayawhip

Source/core/css/CSSToLengthConversionData.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/CSSToLengthConversionData.h"
 
 #include "core/layout/LayoutView.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 
 namespace blink {
 
 CSSToLengthConversionData::FontSizes::FontSizes(float em, float rem, const Font* font)
     : m_em(em)
     , m_rem(rem)
     , m_font(font)
 {
     // FIXME: Improve RAII of StyleResolverState to use const Font&.
     ASSERT(m_font);
 }
 
-CSSToLengthConversionData::FontSizes::FontSizes(const LayoutStyle* style, const LayoutStyle* rootStyle)
+CSSToLengthConversionData::FontSizes::FontSizes(const ComputedStyle* style, const ComputedStyle* rootStyle)
     : FontSizes(style->computedFontSize(), rootStyle ? rootStyle->computedFontSize() : 1.0f, &style->font())
 {
 }
 
 float CSSToLengthConversionData::FontSizes::ex() const
 {
     ASSERT(m_font);
     // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
     // We really need to compute EX using fontMetrics for the original specifiedSize and not use
     // our actual constructed rendering font.
     if (!m_font->fontMetrics().hasXHeight())
         return m_em / 2.0f;
     return m_font->fontMetrics().xHeight();
 }
 
 float CSSToLengthConversionData::FontSizes::ch() const
 {
     ASSERT(m_font);
     return m_font->fontMetrics().zeroWidth();
 }
 
 CSSToLengthConversionData::ViewportSize::ViewportSize(const LayoutView* layoutView)
     : m_width(layoutView ? layoutView->layoutViewportWidth() : 0)
     , m_height(layoutView ? layoutView->layoutViewportHeight() : 0)
 {
 }
 
-CSSToLengthConversionData::CSSToLengthConversionData(const LayoutStyle* style, const FontSizes& fontSizes, const ViewportSize& viewportSize, float zoom)
+CSSToLengthConversionData::CSSToLengthConversionData(const ComputedStyle* style, const FontSizes& fontSizes, const ViewportSize& viewportSize, float zoom)
     : m_style(style)
     , m_fontSizes(fontSizes)
     , m_viewportSize(viewportSize)
     , m_zoom(clampTo<float>(zoom, std::numeric_limits<float>::denorm_min()))
 {
     ASSERT(m_style);
 }
 
-CSSToLengthConversionData::CSSToLengthConversionData(const LayoutStyle* style, const LayoutStyle* rootStyle, const LayoutView* layoutView, float zoom)
+CSSToLengthConversionData::CSSToLengthConversionData(const ComputedStyle* style, const ComputedStyle* rootStyle, const LayoutView* layoutView, float zoom)
     : CSSToLengthConversionData(style, FontSizes(style, rootStyle), ViewportSize(layoutView), zoom)
 {
 }
 
 double CSSToLengthConversionData::viewportWidthPercent() const
 {
     m_style->setHasViewportUnits();
     return m_viewportSize.width() / 100;
 }
 double CSSToLengthConversionData::viewportHeightPercent() const
 {
     m_style->setHasViewportUnits();
     return m_viewportSize.height() / 100;
 }
 double CSSToLengthConversionData::viewportMinPercent() const
 {
     m_style->setHasViewportUnits();
     return std::min(m_viewportSize.width(), m_viewportSize.height()) / 100;
 }
 double CSSToLengthConversionData::viewportMaxPercent() const
 {
     m_style->setHasViewportUnits();
     return std::max(m_viewportSize.width(), m_viewportSize.height()) / 100;
 }
 
 } // namespace blink