Rename LayoutStyle to papayawhip

Source/core/css/resolver/FontBuilder.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2015 Collabora Ltd. 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.
@@ skipping 215 matching lines @@
 float FontBuilder::getComputedSizeFromSpecifiedSize(FontDescription& fontDescription, float effectiveZoom, float specifiedSize)
 {
     float zoomFactor = effectiveZoom;
     // FIXME: Why is this here!!!!?!
     if (LocalFrame* frame = m_document.frame())
         zoomFactor *= frame->textZoomFactor();
 
     return FontSize::getComputedSizeFromSpecifiedSize(&m_document, zoomFactor, fontDescription.isAbsoluteSize(), specifiedSize);
 }
 
-static FontOrientation fontOrientation(const LayoutStyle& style)
+static FontOrientation fontOrientation(const ComputedStyle& style)
 {
     if (style.isHorizontalWritingMode())
         return FontOrientation::Horizontal;
 
     switch (style.textOrientation()) {
     case TextOrientationVerticalRight:
         return FontOrientation::VerticalMixed;
     case TextOrientationUpright:
         return FontOrientation::VerticalUpright;
     case TextOrientationSideways:
         if (style.writingMode() == LeftToRightWritingMode) {
             // FIXME: This should map to sideways-left, which is not supported yet.
             return FontOrientation::VerticalRotated;
         }
         return FontOrientation::VerticalRotated;
     case TextOrientationSidewaysRight:
         return FontOrientation::VerticalRotated;
     default:
         ASSERT_NOT_REACHED();
         return FontOrientation::VerticalMixed;
     }
 }
 
-void FontBuilder::updateOrientation(FontDescription& description, const LayoutStyle& style)
+void FontBuilder::updateOrientation(FontDescription& description, const ComputedStyle& style)
 {
     description.setOrientation(fontOrientation(style));
 }
 
 void FontBuilder::checkForGenericFamilyChange(const FontDescription& oldDescription, FontDescription& newDescription)
 {
     if (newDescription.isAbsoluteSize())
         return;
 
     if (newDescription.fixedPitchFontType() == oldDescription.fixedPitchFontType())
@@ skipping 17 matching lines @@
             ? static_cast<float>(settings->defaultFixedFontSize()) / settings->defaultFontSize()
             : 1;
         size = oldDescription.fixedPitchFontType() == FixedPitchFont ?
             newDescription.specifiedSize() / fixedScaleFactor :
             newDescription.specifiedSize() * fixedScaleFactor;
     }
 
     newDescription.setSpecifiedSize(size);
 }
 
-void FontBuilder::updateSpecifiedSize(FontDescription& fontDescription, const LayoutStyle& style)
+void FontBuilder::updateSpecifiedSize(FontDescription& fontDescription, const ComputedStyle& style)
 {
     float specifiedSize = fontDescription.specifiedSize();
 
     if (!specifiedSize && fontDescription.keywordSize())
         specifiedSize = FontSize::fontSizeForKeyword(&m_document, fontDescription.keywordSize(), fontDescription.fixedPitchFontType());
 
     fontDescription.setSpecifiedSize(specifiedSize);
 
     checkForGenericFamilyChange(style.fontDescription(), fontDescription);
 }
 
-void FontBuilder::updateAdjustedSize(FontDescription& fontDescription, const LayoutStyle& style, FontSelector* fontSelector)
+void FontBuilder::updateAdjustedSize(FontDescription& fontDescription, const ComputedStyle& style, FontSelector* fontSelector)
 {
     const float specifiedSize = fontDescription.specifiedSize();
     if (!fontDescription.hasSizeAdjust() || !specifiedSize)
         return;
 
     // We need to create a temporal Font to get xHeight of a primary font.
     // The aspect value is based on the xHeight of the font for the computed font size,
     // so we need to reset the adjustedSize to computedSize. See FontDescription::effectiveFontSize.
     fontDescription.setAdjustedSize(fontDescription.computedSize());
 
     Font font(fontDescription);
     font.update(fontSelector);
     if (!font.fontMetrics().hasXHeight())
         return;
 
     const float sizeAdjust = fontDescription.sizeAdjust();
     float aspectValue = font.fontMetrics().xHeight() / specifiedSize;
     float adjustedSize = (sizeAdjust / aspectValue) * specifiedSize;
     adjustedSize = getComputedSizeFromSpecifiedSize(fontDescription, style.effectiveZoom(), adjustedSize);
 
     float multiplier = style.textAutosizingMultiplier();
     if (multiplier > 1)
         adjustedSize = TextAutosizer::computeAutosizedFontSize(adjustedSize, multiplier);
     fontDescription.setAdjustedSize(adjustedSize);
 }
 
-void FontBuilder::updateComputedSize(FontDescription& fontDescription, const LayoutStyle& style)
+void FontBuilder::updateComputedSize(FontDescription& fontDescription, const ComputedStyle& style)
 {
     float computedSize = getComputedSizeFromSpecifiedSize(fontDescription, style.effectiveZoom(), fontDescription.specifiedSize());
     float multiplier = style.textAutosizingMultiplier();
     if (multiplier > 1)
         computedSize = TextAutosizer::computeAutosizedFontSize(computedSize, multiplier);
     fontDescription.setComputedSize(computedSize);
 }
 
-void FontBuilder::createFont(PassRefPtrWillBeRawPtr<FontSelector> fontSelector, LayoutStyle& style)
+void FontBuilder::createFont(PassRefPtrWillBeRawPtr<FontSelector> fontSelector, ComputedStyle& style)
 {
     if (!m_flags)
         return;
 
     FontDescription description = style.fontDescription();
 
     if (isSet(PropertySetFlag::Family)) {
         description.setGenericFamily(m_fontDescription.genericFamily());
         description.setFamily(m_fontDescription.family());
     }
@@ skipping 31 matching lines @@
 
     updateSpecifiedSize(description, style);
     updateComputedSize(description, style);
     updateAdjustedSize(description, style, fontSelector.get());
 
     style.setFontDescription(description);
     style.font().update(fontSelector);
     m_flags = 0;
 }
 
-void FontBuilder::createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector> fontSelector, LayoutStyle& documentStyle)
+void FontBuilder::createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector> fontSelector, ComputedStyle& documentStyle)
 {
     FontDescription fontDescription = FontDescription();
     fontDescription.setLocale(documentStyle.locale());
     fontDescription.setScript(localeToScriptCodeForFontSelection(documentStyle.locale()));
 
     setFamilyDescription(fontDescription, FontBuilder::initialFamilyDescription());
     setSize(fontDescription, FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false));
     updateSpecifiedSize(fontDescription, documentStyle);
     updateComputedSize(fontDescription, documentStyle);
 
     updateOrientation(fontDescription, documentStyle);
     documentStyle.setFontDescription(fontDescription);
     documentStyle.font().update(fontSelector);
 }
 
 }