Constify and use reference for RenderStyle in LayoutTheme

Source/core/layout/LayoutThemeChromiumMac.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 451 matching lines @@
     }
 
     if (needsFallback)
         color = LayoutTheme::systemColor(cssValueId);
 
     m_systemColorCache.set(cssValueId, color.rgb());
 
     return color;
 }
 
-bool LayoutThemeChromiumMac::isControlStyled(const RenderStyle* style, const CachedUAStyle* uaStyle) const
+bool LayoutThemeChromiumMac::isControlStyled(const RenderStyle& style, const CachedUAStyle* uaStyle) const

[dsinclair, 2015/02/04 21:59:29]

Reference for uaStyle?

 {
     ASSERT(uaStyle);
-    if (style->appearance() == TextFieldPart || style->appearance() == TextAreaPart)
-        return style->border() != uaStyle->border || style->boxShadow();
+    if (style.appearance() == TextFieldPart || style.appearance() == TextAreaPart)
+        return style.border() != uastyle.border || style.boxShadow();

[dsinclair, 2015/02/04 21:59:29]

uastyle should be uaStyle and this should still be a pointer (unless you make
the ref change above)

 
     // 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.
-    if (style->appearance() == MenulistPart && style->effectiveZoom() != 1.0f)
+    if (style.appearance() == MenulistPart && style.effectiveZoom() != 1.0f)
         return true;
     // FIXME: NSSearchFieldCell doesn't work well when scaled.
-    if (style->appearance() == SearchFieldPart && style->effectiveZoom() != 1)
+    if (style.appearance() == SearchFieldPart && style.effectiveZoom() != 1)
         return true;
 
     return LayoutTheme::isControlStyled(style, uaStyle);
 }
 
 const int sliderThumbShadowBlur = 1;
 
 void LayoutThemeChromiumMac::adjustPaintInvalidationRect(const RenderObject* o, IntRect& r)
 {
     ControlPart part = o->style()->appearance();
@@ skipping 80 matching lines @@
 }
 
 void LayoutThemeChromiumMac::updatePressedState(NSCell* cell, const RenderObject* o)
 {
     bool oldPressed = [cell isHighlighted];
     bool pressed = o->node() && o->node()->active();
     if (pressed != oldPressed)
         [cell setHighlighted:pressed];
 }
 
-NSControlSize LayoutThemeChromiumMac::controlSizeForFont(RenderStyle* style) const
+NSControlSize LayoutThemeChromiumMac::controlSizeForFont(RenderStyle& style) const

[dsinclair, 2015/02/04 21:59:29]

Looks like RenderStyle can be const here?

[Julien - ping for review, 2015/02/04 22:32:18]

Done.

 {
-    int fontSize = style->fontSize();
+    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(RenderStyle* style)
+static NSControlSize searchFieldControlSizeForFont(RenderStyle& style)

[dsinclair, 2015/02/04 21:59:29]

const RenderStyle?

[Julien - ping for review, 2015/02/04 22:32:18]

Done.

 {
-    int fontSize = style->fontSize();
+    int fontSize = style.fontSize();
     if (fontSize >= 13)
         return NSRegularControlSize;
     if (fontSize >= 11)
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
 void LayoutThemeChromiumMac::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 LayoutThemeChromiumMac::sizeForFont(RenderStyle* style, const IntSize* sizes) const
+IntSize LayoutThemeChromiumMac::sizeForFont(const RenderStyle& style, const IntSize* sizes) const

[dsinclair, 2015/02/04 21:59:29]

Can sizes be a ref? We access without checking if it's null already.

[Julien - ping for review, 2015/02/04 22:32:18]

|sizes| is an array of IntSize so we can't remove the '*'. We could turn them
into const IntSize*& but I don't think that's a good change.

 {
-    if (style->effectiveZoom() != 1.0f) {
+    if (style.effectiveZoom() != 1.0f) {
         IntSize result = sizes[controlSizeForFont(style)];
-        return IntSize(result.width() * style->effectiveZoom(), result.height() * style->effectiveZoom());
+        return IntSize(result.width() * style.effectiveZoom(), result.height() * style.effectiveZoom());
     }
     return sizes[controlSizeForFont(style)];
 }
 
-IntSize LayoutThemeChromiumMac::sizeForSystemFont(RenderStyle* style, const IntSize* sizes) const
+IntSize LayoutThemeChromiumMac::sizeForSystemFont(const RenderStyle& style, const IntSize* sizes) const

[dsinclair, 2015/02/04 21:59:29]

sizes as ref?

[Julien - ping for review, 2015/02/04 22:32:18]

Ditto.

 {
-    if (style->effectiveZoom() != 1.0f) {
+    if (style.effectiveZoom() != 1.0f) {
         IntSize result = sizes[controlSizeForSystemFont(style)];
-        return IntSize(result.width() * style->effectiveZoom(), result.height() * style->effectiveZoom());
+        return IntSize(result.width() * style.effectiveZoom(), result.height() * style.effectiveZoom());
     }
     return sizes[controlSizeForSystemFont(style)];
 }
 
-void LayoutThemeChromiumMac::setSizeFromFont(RenderStyle* style, const IntSize* sizes) const
+void LayoutThemeChromiumMac::setSizeFromFont(RenderStyle& 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));
+    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 LayoutThemeChromiumMac::setFontFromControlSize(RenderStyle* style, NSControlSize controlSize) const
+void LayoutThemeChromiumMac::setFontFromControlSize(RenderStyle& 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());
+    fontDescription.setComputedSize([font pointSize] * style.effectiveZoom());
+    fontDescription.setSpecifiedSize([font pointSize] * style.effectiveZoom());
 
     // Reset line height.
-    style->setLineHeight(RenderStyle::initialLineHeight());
+    style.setLineHeight(RenderStyle::initialLineHeight());
 
-    if (style->setFontDescription(fontDescription))
-        style->font().update(nullptr);
+    if (style.setFontDescription(fontDescription))
+        style.font().update(nullptr);
 }
 
-NSControlSize LayoutThemeChromiumMac::controlSizeForSystemFont(RenderStyle* style) const
+NSControlSize LayoutThemeChromiumMac::controlSizeForSystemFont(RenderStyle& style) const

[dsinclair, 2015/02/04 21:59:29]

const?

[Julien - ping for review, 2015/02/04 22:32:18]

Done.

 {
-    float fontSize = style->fontSize();
-    float zoomLevel = style->effectiveZoom();
+    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;
 }
 
 bool LayoutThemeChromiumMac::paintTextField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
@@ skipping 130 matching lines @@
 
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     float zoomLevel = o->style()->effectiveZoom();
     IntSize size = popupButtonSizes()[[popupButton controlSize]];
     size.setHeight(size.height() * zoomLevel);
     size.setWidth(r.width());
 
     // Now inflate it to account for the shadow.
     IntRect inflatedRect = r;
-    if (r.width() >= minimumMenuListSize(o->style()))
+    if (r.width() >= minimumMenuListSize(o->styleRef()))
         inflatedRect = ThemeMac::inflateRect(inflatedRect, size, popupButtonMargins(), zoomLevel);
 
     LocalCurrentGraphicsContext localContext(paintInfo.context, ThemeMac::inflateRectForFocusRing(inflatedRect));
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
     // On Leopard, the cell will draw outside of the given rect, so we have to
     // clip to the rect.
     paintInfo.context->clip(inflatedRect);
 
     if (zoomLevel != 1.0f) {
@@ skipping 67 matching lines @@
         return NSRatingLevelIndicatorStyle;
     case MeterPart:
     case ContinuousCapacityLevelIndicatorPart:
     default:
         return NSContinuousCapacityLevelIndicatorStyle;
     }
 }
 
 NSLevelIndicatorCell* LayoutThemeChromiumMac::levelIndicatorFor(const RenderMeter* renderMeter) const
 {
-    RenderStyle* style = renderMeter->style();
-    ASSERT(style->appearance() != NoControlPart);
+    RenderStyle& style = renderMeter->style();

[dsinclair, 2015/02/04 21:59:29]

const?

[Julien - ping for review, 2015/02/04 22:32:18]

Done.

+    ASSERT(style.appearance() != NoControlPart);
 
     if (!m_levelIndicator)
         m_levelIndicator.adoptNS([[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle]);
     NSLevelIndicatorCell* cell = m_levelIndicator.get();
 
     HTMLMeterElement* element = renderMeter->meterElement();
     double value = element->value();
 
     // Because NSLevelIndicatorCell does not support optimum-in-the-middle type
     // coloring, we explicitly control the color instead giving low and high
     // value to NSLevelIndicatorCell as is.
     switch (element->gaugeRegion()) {
     case HTMLMeterElement::GaugeRegionOptimum:
         // Make meter the green.
         [cell setWarningValue:value + 1];
         [cell setCriticalValue:value + 2];
         break;
     case HTMLMeterElement::GaugeRegionSuboptimal:
         // Make the meter yellow.
         [cell setWarningValue:value - 1];
         [cell setCriticalValue:value + 1];
         break;
     case HTMLMeterElement::GaugeRegionEvenLessGood:
         // Make the meter red.
         [cell setWarningValue:value - 2];
         [cell setCriticalValue:value - 1];
         break;
     }
 
-    [cell setLevelIndicatorStyle:levelIndicatorStyleFor(style->appearance())];
-    [cell setBaseWritingDirection:style->isLeftToRightDirection() ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft];
+    [cell setLevelIndicatorStyle:levelIndicatorStyleFor(style.appearance())];
+    [cell setBaseWritingDirection:style.isLeftToRightDirection() ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft];
     [cell setMinValue:element->min()];
     [cell setMaxValue:element->max()];
     RetainPtr<NSNumber> valueObject = [NSNumber numberWithDouble:value];
     [cell setObjectValue:valueObject.get()];
 
     return cell;
 }
 
 const IntSize* LayoutThemeChromiumMac::progressBarSizes() const
 {
     static const IntSize sizes[3] = { IntSize(0, 20), IntSize(0, 12), IntSize(0, 12) };
     return sizes;
 }
 
 const int* LayoutThemeChromiumMac::progressBarMargins(NSControlSize controlSize) const
 {
     static const int margins[3][4] =
     {
         { 0, 0, 1, 0 },
         { 0, 0, 1, 0 },
         { 0, 0, 1, 0 },
     };
     return margins[controlSize];
 }
 
-int LayoutThemeChromiumMac::minimumProgressBarHeight(RenderStyle* style) const
+int LayoutThemeChromiumMac::minimumProgressBarHeight(RenderStyle& style) const

[dsinclair, 2015/02/04 21:59:29]

Can't tell from the code below, can this be const?

[Julien - ping for review, 2015/02/04 22:32:18]

It can. Done.

 {
     return sizeForSystemFont(style, progressBarSizes()).height();
 }
 
 double LayoutThemeChromiumMac::animationRepeatIntervalForProgressBar(RenderProgress*) const
 {
     return progressAnimationFrameRate;
 }
 
 double LayoutThemeChromiumMac::animationDurationForProgressBar(RenderProgress*) 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 LayoutThemeChromiumMac::adjustMenuListStyle(RenderStyle* style, Element* e) const
+void LayoutThemeChromiumMac::adjustMenuListStyle(RenderStyle& style, Element* e) const
 {
     NSControlSize controlSize = controlSizeForFont(style);
 
-    style->resetBorder();
-    style->resetPadding();
+    style.resetBorder();
+    style.resetPadding();
 
     // Height is locked to auto.
-    style->setHeight(Length(Auto));
+    style.setHeight(Length(Auto));
 
     // White-space is locked to pre.
-    style->setWhiteSpace(PRE);
+    style.setWhiteSpace(PRE);
 
     // Set the foreground color to black or gray when we have the aqua look.
     // Cast to RGB32 is to work around a compiler bug.
-    style->setColor(e && !e->isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
+    style.setColor(e && !e->isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
 
     // Set the button's vertical size.
     setSizeFromFont(style, menuListButtonSizes());
 
     // Our font is locked to the appropriate system font size for the
     // control. To clarify, we first use the CSS-specified font to figure out a
     // reasonable control size, but once that control size is determined, we
     // throw that font away and use the appropriate system font for the control
     // size instead.
     setFontFromControlSize(style, controlSize);
 }
 
 const int autofillPopupHorizontalPadding = 4;
 
 // These functions are called with MenuListPart or MenulistButtonPart appearance
 // by RenderMenuList, 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 LayoutThemeChromiumMac::popupInternalPaddingLeft(RenderStyle* style) const
+int LayoutThemeChromiumMac::popupInternalPaddingLeft(const RenderStyle& style) const
 {
-    if (style->appearance() == TextFieldPart)
+    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();
+    if (style.appearance() == MenulistPart)
+        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::LeftMargin] * style.effectiveZoom();
+    if (style.appearance() == MenulistButtonPart)
+        return styledPopupPaddingLeft * style.effectiveZoom();
     return 0;
 }
 
-int LayoutThemeChromiumMac::popupInternalPaddingRight(RenderStyle* style) const
+int LayoutThemeChromiumMac::popupInternalPaddingRight(const RenderStyle& style) const
 {
-    if (style->appearance() == TextFieldPart)
+    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;
+    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 static_cast<int>(ceilf(arrowWidth + (arrowPaddingLeft + arrowPaddingRight + paddingBeforeSeparator) * style.effectiveZoom()));
     }
     return 0;
 }
 
-int LayoutThemeChromiumMac::popupInternalPaddingTop(RenderStyle* style) const
+int LayoutThemeChromiumMac::popupInternalPaddingTop(const RenderStyle& style) const
 {
-    if (style->appearance() == MenulistPart)
-        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::TopMargin] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonPart)
-        return styledPopupPaddingTop * style->effectiveZoom();
+    if (style.appearance() == MenulistPart)
+        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::TopMargin] * style.effectiveZoom();
+    if (style.appearance() == MenulistButtonPart)
+        return styledPopupPaddingTop * style.effectiveZoom();
     return 0;
 }
 
-int LayoutThemeChromiumMac::popupInternalPaddingBottom(RenderStyle* style) const
+int LayoutThemeChromiumMac::popupInternalPaddingBottom(const RenderStyle& style) const
 {
-    if (style->appearance() == MenulistPart)
-        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::BottomMargin] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonPart)
-        return styledPopupPaddingBottom * style->effectiveZoom();
+    if (style.appearance() == MenulistPart)
+        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::BottomMargin] * style.effectiveZoom();
+    if (style.appearance() == MenulistButtonPart)
+        return styledPopupPaddingBottom * style.effectiveZoom();
     return 0;
 }
 
-void LayoutThemeChromiumMac::adjustMenuListButtonStyle(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustMenuListButtonStyle(RenderStyle& style, Element*) const
 {
-    float fontScale = style->fontSize() / baseFontSize;
+    float fontScale = style.fontSize() / baseFontSize;
 
-    style->resetPadding();
-    style->setBorderRadius(IntSize(int(baseBorderRadius + fontScale - 1), int(baseBorderRadius + fontScale - 1))); // FIXME: Round up?
+    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.setMinHeight(Length(minHeight, Fixed));
 
-    style->setLineHeight(RenderStyle::initialLineHeight());
+    style.setLineHeight(RenderStyle::initialLineHeight());
 }
 
 void LayoutThemeChromiumMac::setPopupButtonCellState(const RenderObject* 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* LayoutThemeChromiumMac::menuListSizes() const
 {
     static const IntSize sizes[3] = { IntSize(9, 0), IntSize(5, 0), IntSize(0, 0) };
     return sizes;
 }
 
-int LayoutThemeChromiumMac::minimumMenuListSize(RenderStyle* style) const
+int LayoutThemeChromiumMac::minimumMenuListSize(const RenderStyle& style) const
 {
     return sizeForSystemFont(style, menuListSizes()).width();
 }
 
 const int sliderTrackWidth = 5;
 const int sliderTrackBorderWidth = 1;
 
 bool LayoutThemeChromiumMac::paintSliderTrack(RenderObject* 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 LayoutThemeChromiumMac::setSearchFieldSize(RenderStyle* style) const
+void LayoutThemeChromiumMac::setSearchFieldSize(RenderStyle& style) const
 {
     // If the width and height are both specified, then we have nothing to do.
-    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
+    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 LayoutThemeChromiumMac::adjustSearchFieldStyle(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustSearchFieldStyle(RenderStyle& 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);
-    style->setBorderTopWidth(borderWidth);
-    style->setBorderTopStyle(INSET);
+    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);
+    style.setBorderTopWidth(borderWidth);
+    style.setBorderTopStyle(INSET);
 
     // Override height.
-    style->setHeight(Length(Auto));
+    style.setHeight(Length(Auto));
     setSearchFieldSize(style);
 
     NSControlSize controlSize = controlSizeForFont(style);
 
     // Override padding size to match AppKit text positioning.
-    const int verticalPadding = 1 * style->effectiveZoom();
-    const int horizontalPadding = searchFieldHorizontalPaddings()[controlSize] * style->effectiveZoom();
-    style->setPaddingLeft(Length(horizontalPadding, Fixed));
-    style->setPaddingRight(Length(horizontalPadding, Fixed));
-    style->setPaddingTop(Length(verticalPadding, Fixed));
-    style->setPaddingBottom(Length(verticalPadding, Fixed));
+    const int verticalPadding = 1 * style.effectiveZoom();
+    const int horizontalPadding = searchFieldHorizontalPaddings()[controlSize] * style.effectiveZoom();
+    style.setPaddingLeft(Length(horizontalPadding, Fixed));
+    style.setPaddingRight(Length(horizontalPadding, Fixed));
+    style.setPaddingTop(Length(verticalPadding, Fixed));
+    style.setPaddingBottom(Length(verticalPadding, Fixed));
 
     setFontFromControlSize(style, controlSize);
 
-    style->setBoxShadow(nullptr);
+    style.setBoxShadow(nullptr);
 }
 
 bool LayoutThemeChromiumMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     if (!o->node())
         return false;
     Element* input = o->node()->shadowHost();
     if (!input)
         input = toElement(o->node());
 
@@ skipping 45 matching lines @@
 
     return false;
 }
 
 const IntSize* LayoutThemeChromiumMac::cancelButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(14, 14), IntSize(11, 11), IntSize(9, 9) };
     return sizes;
 }
 
-void LayoutThemeChromiumMac::adjustSearchFieldCancelButtonStyle(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustSearchFieldCancelButtonStyle(RenderStyle& style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, cancelButtonSizes());
-    style->setWidth(Length(size.width(), Fixed));
-    style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(nullptr);
+    style.setWidth(Length(size.width(), Fixed));
+    style.setHeight(Length(size.height(), Fixed));
+    style.setBoxShadow(nullptr);
 }
 
 const IntSize* LayoutThemeChromiumMac::resultsButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(15, 14), IntSize(16, 13), IntSize(14, 11) };
     return sizes;
 }
 
-void LayoutThemeChromiumMac::adjustSearchFieldDecorationStyle(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustSearchFieldDecorationStyle(RenderStyle& 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);
+    style.setWidth(Length(width, Fixed));
+    style.setHeight(Length(0, Fixed));
+    style.setBoxShadow(nullptr);
 }
 
 bool LayoutThemeChromiumMac::paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&)
 {
     return false;
 }
 
-void LayoutThemeChromiumMac::adjustSearchFieldResultsDecorationStyle(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustSearchFieldResultsDecorationStyle(RenderStyle& style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
-    style->setWidth(Length(size.width(), Fixed));
-    style->setHeight(Length(size.height(), Fixed));
-    style->setBoxShadow(nullptr);
+    style.setWidth(Length(size.width(), Fixed));
+    style.setHeight(Length(size.height(), Fixed));
+    style.setBoxShadow(nullptr);
 }
 
 bool LayoutThemeChromiumMac::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     if (!o->node())
         return false;
     Node* input = o->node()->shadowHost();
     if (!input)
         input = o->node();
     if (!input->renderer()->isBox())
@@ skipping 29 matching lines @@
 IntSize LayoutThemeChromiumMac::sliderTickSize() const
 {
     return IntSize(1, 3);
 }
 
 int LayoutThemeChromiumMac::sliderTickOffsetFromTrackCenter() const
 {
     return -9;
 }
 
-void LayoutThemeChromiumMac::adjustSliderThumbSize(RenderStyle* style, Element*) const
+void LayoutThemeChromiumMac::adjustSliderThumbSize(RenderStyle& 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));
+    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);
 }
 
 NSPopUpButtonCell* LayoutThemeChromiumMac::popupButton() const
 {
     if (!m_popupButton) {
         m_popupButton.adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
         [m_popupButton.get() setUsesItemFromMenu:NO];
@@ skipping 113 matching lines @@
 
     if (tint != oldTint)
         [cell setControlTint:tint];
 }
 
 bool LayoutThemeChromiumMac::shouldShowPlaceholderWhenFocused() const
 {
     return true;
 }
 
-void LayoutThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const
+void LayoutThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle& style) const
 {
     RenderMediaControls::adjustMediaSliderThumbSize(style);
 }
 
 bool LayoutThemeChromiumMac::paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaPlayButton, object, paintInfo, rect);
 }
 
 bool LayoutThemeChromiumMac::paintMediaOverlayPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
@@ skipping 58 matching lines @@
 bool LayoutThemeChromiumMac::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaEnterFullscreenButton, object, paintInfo, rect);
 }
 
 bool LayoutThemeChromiumMac::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaShowClosedCaptionsButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
+bool LayoutThemeChromiumMac::shouldUseFallbackTheme(const RenderStyle& style) const
 {
-    ControlPart part = style->appearance();
+    ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
-        return style->effectiveZoom() != 1;
+        return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink