Rename LayoutStyle to papayawhip

Source/core/layout/LayoutThemeMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * 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,
@@ skipping 452 matching lines @@
     }
 
     if (needsFallback)
         color = LayoutTheme::systemColor(cssValueId);
 
     m_systemColorCache.set(cssValueId, color.rgb());
 
     return color;
 }
 
-bool LayoutThemeMac::isControlStyled(const LayoutStyle& style, const AuthorStyleInfo& authorStyle) const
+bool LayoutThemeMac::isControlStyled(const ComputedStyle& style, const AuthorStyleInfo& authorStyle) const
 {
     if (style.appearance() == TextFieldPart || style.appearance() == TextAreaPart)
         return authorStyle.specifiesBorder() || style.boxShadow();
 
     // FIXME: This is horrible, but there is not much else that can be done.
     // Menu lists cannot draw properly when scaled. They can't really draw
     // properly when transformed either. We can't detect the transform case at
     // style adjustment time so that will just have to stay broken.  We can
     // however detect that we're zooming. If zooming is in effect we treat it
     // like the control is styled.
@@ skipping 94 matching lines @@
 }
 
 void LayoutThemeMac::updatePressedState(NSCell* cell, const LayoutObject* o)
 {
     bool oldPressed = [cell isHighlighted];
     bool pressed = o->node() && o->node()->active();
     if (pressed != oldPressed)
         [cell setHighlighted:pressed];
 }
 
-NSControlSize LayoutThemeMac::controlSizeForFont(const LayoutStyle& style) const
+NSControlSize LayoutThemeMac::controlSizeForFont(const ComputedStyle& style) const
 {
     int fontSize = style.fontSize();
     if (fontSize >= 16)
         return NSRegularControlSize;
     if (fontSize >= 11)
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
 // We don't use controlSizeForFont() for search field decorations because it
 // needs to fit into the search field. The font size will already be modified by
 // setFontFromControlSize() called on the search field.
-static NSControlSize searchFieldControlSizeForFont(const LayoutStyle& style)
+static NSControlSize searchFieldControlSizeForFont(const ComputedStyle& style)
 {
     int fontSize = style.fontSize();
     if (fontSize >= 13)
         return NSRegularControlSize;
     if (fontSize >= 11)
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
 void LayoutThemeMac::setControlSize(NSCell* cell, const IntSize* sizes, const IntSize& minSize, float zoomLevel)
 {
     NSControlSize size;
     if (minSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomLevel) &&
         minSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomLevel))
         size = NSRegularControlSize;
     else if (minSize.width() >= static_cast<int>(sizes[NSSmallControlSize].width() * zoomLevel) &&
              minSize.height() >= static_cast<int>(sizes[NSSmallControlSize].height() * zoomLevel))
         size = NSSmallControlSize;
     else
         size = NSMiniControlSize;
     // Only update if we have to, since AppKit does work even if the size is the
     // same.
     if (size != [cell controlSize])
         [cell setControlSize:size];
 }
 
-IntSize LayoutThemeMac::sizeForFont(const LayoutStyle& style, const IntSize* sizes) const
+IntSize LayoutThemeMac::sizeForFont(const ComputedStyle& style, const IntSize* sizes) const
 {
     if (style.effectiveZoom() != 1.0f) {
         IntSize result = sizes[controlSizeForFont(style)];
         return IntSize(result.width() * style.effectiveZoom(), result.height() * style.effectiveZoom());
     }
     return sizes[controlSizeForFont(style)];
 }
 
-IntSize LayoutThemeMac::sizeForSystemFont(const LayoutStyle& style, const IntSize* sizes) const
+IntSize LayoutThemeMac::sizeForSystemFont(const ComputedStyle& style, const IntSize* sizes) const
 {
     if (style.effectiveZoom() != 1.0f) {
         IntSize result = sizes[controlSizeForSystemFont(style)];
         return IntSize(result.width() * style.effectiveZoom(), result.height() * style.effectiveZoom());
     }
     return sizes[controlSizeForSystemFont(style)];
 }
 
-void LayoutThemeMac::setSizeFromFont(LayoutStyle& style, const IntSize* sizes) const
+void LayoutThemeMac::setSizeFromFont(ComputedStyle& style, const IntSize* sizes) const
 {
     // FIXME: Check is flawed, since it doesn't take min-width/max-width into
     // account.
     IntSize size = sizeForFont(style, sizes);
     if (style.width().isIntrinsicOrAuto() && size.width() > 0)
         style.setWidth(Length(size.width(), Fixed));
     if (style.height().isAuto() && size.height() > 0)
         style.setHeight(Length(size.height(), Fixed));
 }
 
-void LayoutThemeMac::setFontFromControlSize(LayoutStyle& style, NSControlSize controlSize) const
+void LayoutThemeMac::setFontFromControlSize(ComputedStyle& style, NSControlSize controlSize) const
 {
     FontDescription fontDescription;
     fontDescription.setIsAbsoluteSize(true);
     fontDescription.setGenericFamily(FontDescription::SerifFamily);
 
     NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]];
     fontDescription.firstFamily().setFamily([font webCoreFamilyName]);
     fontDescription.setComputedSize([font pointSize] * style.effectiveZoom());
     fontDescription.setSpecifiedSize([font pointSize] * style.effectiveZoom());
 
     // Reset line height.
-    style.setLineHeight(LayoutStyle::initialLineHeight());
+    style.setLineHeight(ComputedStyle::initialLineHeight());
 
     if (style.setFontDescription(fontDescription))
         style.font().update(nullptr);
 }
 
-NSControlSize LayoutThemeMac::controlSizeForSystemFont(const LayoutStyle& style) const
+NSControlSize LayoutThemeMac::controlSizeForSystemFont(const ComputedStyle& style) const
 {
     float fontSize = style.fontSize();
     float zoomLevel = style.effectiveZoom();
     if (zoomLevel != 1)
         fontSize /= zoomLevel;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
         return NSRegularControlSize;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
         return NSSmallControlSize;
     return NSMiniControlSize;
@@ skipping 221 matching lines @@
         return NSRatingLevelIndicatorStyle;
     case MeterPart:
     case ContinuousCapacityLevelIndicatorPart:
     default:
         return NSContinuousCapacityLevelIndicatorStyle;
     }
 }
 
 NSLevelIndicatorCell* LayoutThemeMac::levelIndicatorFor(const LayoutMeter* layoutMeter) const
 {
-    const LayoutStyle& style = layoutMeter->styleRef();
+    const ComputedStyle& style = layoutMeter->styleRef();
     ASSERT(style.appearance() != NoControlPart);
 
     if (!m_levelIndicator)
         m_levelIndicator.adoptNS([[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle]);
     NSLevelIndicatorCell* cell = m_levelIndicator.get();
 
     HTMLMeterElement* element = layoutMeter->meterElement();
     double value = element->value();
 
     // Because NSLevelIndicatorCell does not support optimum-in-the-middle type
@@ skipping 37 matching lines @@
 {
     static const int margins[3][4] =
     {
         { 0, 0, 1, 0 },
         { 0, 0, 1, 0 },
         { 0, 0, 1, 0 },
     };
     return margins[controlSize];
 }
 
-int LayoutThemeMac::minimumProgressBarHeight(const LayoutStyle& style) const
+int LayoutThemeMac::minimumProgressBarHeight(const ComputedStyle& style) const
 {
     return sizeForSystemFont(style, progressBarSizes()).height();
 }
 
 double LayoutThemeMac::animationRepeatIntervalForProgressBar() const
 {
     return progressAnimationFrameRate;
 }
 
 double LayoutThemeMac::animationDurationForProgressBar() const
@@ skipping 104 matching lines @@
     paintInfo.context->fillPolygon(3, arrow2, color, true);
     return false;
 }
 
 static const IntSize* menuListButtonSizes()
 {
     static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
     return sizes;
 }
 
-void LayoutThemeMac::adjustMenuListStyle(LayoutStyle& style, Element* e) const
+void LayoutThemeMac::adjustMenuListStyle(ComputedStyle& style, Element* e) const
 {
     NSControlSize controlSize = controlSizeForFont(style);
 
     style.resetBorder();
     style.resetPadding();
 
     // Height is locked to auto.
     style.setHeight(Length(Auto));
 
     // White-space is locked to pre.
@@ skipping 15 matching lines @@
 }
 
 const int autofillPopupHorizontalPadding = 4;
 
 // These functions are called with MenuListPart or MenulistButtonPart appearance
 // by LayoutMenuList, or with TextFieldPart appearance by
 // AutofillPopupMenuClient. We assume only AutofillPopupMenuClient gives
 // TexfieldPart appearance here. We want to change only Autofill padding.  In
 // the future, we have to separate Autofill popup window logic from WebKit to
 // Chromium.
-int LayoutThemeMac::popupInternalPaddingLeft(const LayoutStyle& style) const
+int LayoutThemeMac::popupInternalPaddingLeft(const ComputedStyle& style) const
 {
     if (style.appearance() == TextFieldPart)
         return autofillPopupHorizontalPadding;
 
     if (style.appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[ThemeMac::LeftMargin] * style.effectiveZoom();
     if (style.appearance() == MenulistButtonPart)
         return styledPopupPaddingLeft * style.effectiveZoom();
     return 0;
 }
 
-int LayoutThemeMac::popupInternalPaddingRight(const LayoutStyle& style) const
+int LayoutThemeMac::popupInternalPaddingRight(const ComputedStyle& style) const
 {
     if (style.appearance() == TextFieldPart)
         return autofillPopupHorizontalPadding;
 
     if (style.appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[ThemeMac::RightMargin] * style.effectiveZoom();
     if (style.appearance() == MenulistButtonPart) {
         float fontScale = style.fontSize() / baseFontSize;
         float arrowWidth = baseArrowWidth * fontScale;
         return static_cast<int>(ceilf(arrowWidth + (arrowPaddingLeft + arrowPaddingRight + paddingBeforeSeparator) * style.effectiveZoom()));
     }
     return 0;
 }
 
-int LayoutThemeMac::popupInternalPaddingTop(const LayoutStyle& style) const
+int LayoutThemeMac::popupInternalPaddingTop(const ComputedStyle& style) const
 {
     if (style.appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[ThemeMac::TopMargin] * style.effectiveZoom();
     if (style.appearance() == MenulistButtonPart)
         return styledPopupPaddingTop * style.effectiveZoom();
     return 0;
 }
 
-int LayoutThemeMac::popupInternalPaddingBottom(const LayoutStyle& style) const
+int LayoutThemeMac::popupInternalPaddingBottom(const ComputedStyle& style) const
 {
     if (style.appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[ThemeMac::BottomMargin] * style.effectiveZoom();
     if (style.appearance() == MenulistButtonPart)
         return styledPopupPaddingBottom * style.effectiveZoom();
     return 0;
 }
 
-void LayoutThemeMac::adjustMenuListButtonStyle(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustMenuListButtonStyle(ComputedStyle& style, Element*) const
 {
     float fontScale = style.fontSize() / baseFontSize;
 
     style.resetPadding();
     style.setBorderRadius(IntSize(int(baseBorderRadius + fontScale - 1), int(baseBorderRadius + fontScale - 1))); // FIXME: Round up?
 
     const int minHeight = 15;
     style.setMinHeight(Length(minHeight, Fixed));
 
-    style.setLineHeight(LayoutStyle::initialLineHeight());
+    style.setLineHeight(ComputedStyle::initialLineHeight());
 }
 
 void LayoutThemeMac::setPopupButtonCellState(const LayoutObject* o, const IntRect& r)
 {
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     // Set the control size based off the rectangle we're painting into.
     setControlSize(popupButton, popupButtonSizes(), r.size(), o->style()->effectiveZoom());
 
     // Update the various states we respond to.
     updateActiveState(popupButton, o);
     updateCheckedState(popupButton, o);
     updateEnabledState(popupButton, o);
     updatePressedState(popupButton, o);
 #if BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
     updateFocusedState(popupButton, o);
 #endif
 }
 
 const IntSize* LayoutThemeMac::menuListSizes() const
 {
     static const IntSize sizes[3] = { IntSize(9, 0), IntSize(5, 0), IntSize(0, 0) };
     return sizes;
 }
 
-int LayoutThemeMac::minimumMenuListSize(const LayoutStyle& style) const
+int LayoutThemeMac::minimumMenuListSize(const ComputedStyle& style) const
 {
     return sizeForSystemFont(style, menuListSizes()).width();
 }
 
 const int sliderTrackWidth = 5;
 const int sliderTrackBorderWidth = 1;
 
 bool LayoutThemeMac::paintSliderTrack(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     paintSliderTicks(o, paintInfo, r);
@@ skipping 198 matching lines @@
     static const IntSize sizes[3] = { IntSize(0, 22), IntSize(0, 19), IntSize(0, 15) };
     return sizes;
 }
 
 static const int* searchFieldHorizontalPaddings()
 {
     static const int sizes[3] = { 3, 2, 1 };
     return sizes;
 }
 
-void LayoutThemeMac::setSearchFieldSize(LayoutStyle& style) const
+void LayoutThemeMac::setSearchFieldSize(ComputedStyle& style) const
 {
     // If the width and height are both specified, then we have nothing to do.
     if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
         return;
 
     // Use the font size to determine the intrinsic width of the control.
     setSizeFromFont(style, searchFieldSizes());
 }
 
 const int searchFieldBorderWidth = 2;
-void LayoutThemeMac::adjustSearchFieldStyle(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustSearchFieldStyle(ComputedStyle& style, Element*) const
 {
     // Override border.
     style.resetBorder();
     const short borderWidth = searchFieldBorderWidth * style.effectiveZoom();
     style.setBorderLeftWidth(borderWidth);
     style.setBorderLeftStyle(INSET);
     style.setBorderRightWidth(borderWidth);
     style.setBorderRightStyle(INSET);
     style.setBorderBottomWidth(borderWidth);
     style.setBorderBottomStyle(INSET);
@@ skipping 75 matching lines @@
 
     return false;
 }
 
 const IntSize* LayoutThemeMac::cancelButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(14, 14), IntSize(11, 11), IntSize(9, 9) };
     return sizes;
 }
 
-void LayoutThemeMac::adjustSearchFieldCancelButtonStyle(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustSearchFieldCancelButtonStyle(ComputedStyle& style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, cancelButtonSizes());
     style.setWidth(Length(size.width(), Fixed));
     style.setHeight(Length(size.height(), Fixed));
     style.setBoxShadow(nullptr);
 }
 
 const IntSize* LayoutThemeMac::resultsButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(15, 14), IntSize(16, 13), IntSize(14, 11) };
     return sizes;
 }
 
-void LayoutThemeMac::adjustSearchFieldDecorationStyle(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustSearchFieldDecorationStyle(ComputedStyle& style, Element*) const
 {
     NSControlSize controlSize = controlSizeForSystemFont(style);
     IntSize searchFieldSize = searchFieldSizes()[controlSize];
     int width = searchFieldSize.height() / 2 - searchFieldBorderWidth - searchFieldHorizontalPaddings()[controlSize];
     style.setWidth(Length(width, Fixed));
     style.setHeight(Length(0, Fixed));
     style.setBoxShadow(nullptr);
 }
 
 bool LayoutThemeMac::paintSearchFieldDecoration(LayoutObject*, const PaintInfo&, const IntRect&)
 {
     return false;
 }
 
-void LayoutThemeMac::adjustSearchFieldResultsDecorationStyle(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustSearchFieldResultsDecorationStyle(ComputedStyle& style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
     style.setWidth(Length(size.width(), Fixed));
     style.setHeight(Length(size.height(), Fixed));
     style.setBoxShadow(nullptr);
 }
 
 bool LayoutThemeMac::paintSearchFieldResultsDecoration(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     if (!o->node())
@@ skipping 34 matching lines @@
 IntSize LayoutThemeMac::sliderTickSize() const
 {
     return IntSize(1, 3);
 }
 
 int LayoutThemeMac::sliderTickOffsetFromTrackCenter() const
 {
     return -9;
 }
 
-void LayoutThemeMac::adjustSliderThumbSize(LayoutStyle& style, Element*) const
+void LayoutThemeMac::adjustSliderThumbSize(ComputedStyle& style, Element*) const
 {
     float zoomLevel = style.effectiveZoom();
     if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) {
         style.setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fixed));
         style.setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
     }
 
     adjustMediaSliderThumbSize(style);
 }
 
@@ skipping 118 matching lines @@
 
     if (tint != oldTint)
         [cell setControlTint:tint];
 }
 
 bool LayoutThemeMac::shouldShowPlaceholderWhenFocused() const
 {
     return true;
 }
 
-void LayoutThemeMac::adjustMediaSliderThumbSize(LayoutStyle& style) const
+void LayoutThemeMac::adjustMediaSliderThumbSize(ComputedStyle& style) const
 {
     LayoutMediaControls::adjustMediaSliderThumbSize(style);
 }
 
 bool LayoutThemeMac::paintMediaPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return LayoutMediaControls::paintMediaControlsPart(MediaPlayButton, object, paintInfo, rect);
 }
 
 bool LayoutThemeMac::paintMediaOverlayPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
@@ skipping 58 matching lines @@
 bool LayoutThemeMac::paintMediaFullscreenButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return LayoutMediaControls::paintMediaControlsPart(MediaEnterFullscreenButton, object, paintInfo, rect);
 }
 
 bool LayoutThemeMac::paintMediaToggleClosedCaptionsButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return LayoutMediaControls::paintMediaControlsPart(MediaShowClosedCaptionsButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeMac::shouldUseFallbackTheme(const LayoutStyle& style) const
+bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink