Constify and use reference for RenderStyle in LayoutTheme

Source/core/layout/LayoutTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, 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.
  *
@@ skipping 69 matching lines @@
 }
 
 LayoutTheme::LayoutTheme()
     : m_hasCustomFocusRingColor(false)
 #if USE(NEW_THEME)
     , m_platformTheme(platformTheme())
 #endif
 {
 }
 
-void LayoutTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyle* uaStyle)
+void LayoutTheme::adjustStyle(RenderStyle& style, Element* e, const CachedUAStyle* uaStyle)
 {
     // Force inline and table display styles to be inline-block (except for table- which is block)
-    ControlPart part = style->appearance();
-    if (style->display() == INLINE || style->display() == INLINE_TABLE || style->display() == TABLE_ROW_GROUP
-        || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_FOOTER_GROUP
-        || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GROUP || style->display() == TABLE_COLUMN
-        || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION)
-        style->setDisplay(INLINE_BLOCK);
-    else if (style->display() == LIST_ITEM || style->display() == TABLE)
-        style->setDisplay(BLOCK);
+    ControlPart part = style.appearance();
+    if (style.display() == INLINE || style.display() == INLINE_TABLE || style.display() == TABLE_ROW_GROUP
+        || style.display() == TABLE_HEADER_GROUP || style.display() == TABLE_FOOTER_GROUP
+        || style.display() == TABLE_ROW || style.display() == TABLE_COLUMN_GROUP || style.display() == TABLE_COLUMN
+        || style.display() == TABLE_CELL || style.display() == TABLE_CAPTION)
+        style.setDisplay(INLINE_BLOCK);
+    else if (style.display() == LIST_ITEM || style.display() == TABLE)
+        style.setDisplay(BLOCK);
 
     if (uaStyle && isControlStyled(style, uaStyle)) {
         if (part == MenulistPart) {
-            style->setAppearance(MenulistButtonPart);
+            style.setAppearance(MenulistButtonPart);
             part = MenulistButtonPart;
         } else {
-            style->setAppearance(NoControlPart);
+            style.setAppearance(NoControlPart);
         }
     }
 
-    if (!style->hasAppearance())
+    if (!style.hasAppearance())
         return;
 
     if (shouldUseFallbackTheme(style)) {
         adjustStyleUsingFallbackTheme(style, e);
         return;
     }
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case InnerSpinButtonPart:
     case RadioPart:
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart: {
         // Border
-        LengthBox borderBox(style->borderTopWidth(), style->borderRightWidth(), style->borderBottomWidth(), style->borderLeftWidth());
-        borderBox = m_platformTheme->controlBorder(part, style->font().fontDescription(), borderBox, style->effectiveZoom());
-        if (borderBox.top().value() != static_cast<int>(style->borderTopWidth())) {
+        LengthBox borderBox(style.borderTopWidth(), style.borderRightWidth(), style.borderBottomWidth(), style.borderLeftWidth());
+        borderBox = m_platformTheme->controlBorder(part, style.font().fontDescription(), borderBox, style.effectiveZoom());
+        if (borderBox.top().value() != static_cast<int>(style.borderTopWidth())) {
             if (borderBox.top().value())
-                style->setBorderTopWidth(borderBox.top().value());
+                style.setBorderTopWidth(borderBox.top().value());
             else
-                style->resetBorderTop();
+                style.resetBorderTop();
         }
-        if (borderBox.right().value() != static_cast<int>(style->borderRightWidth())) {
+        if (borderBox.right().value() != static_cast<int>(style.borderRightWidth())) {
             if (borderBox.right().value())
-                style->setBorderRightWidth(borderBox.right().value());
+                style.setBorderRightWidth(borderBox.right().value());
             else
-                style->resetBorderRight();
+                style.resetBorderRight();
         }
-        if (borderBox.bottom().value() != static_cast<int>(style->borderBottomWidth())) {
-            style->setBorderBottomWidth(borderBox.bottom().value());
+        if (borderBox.bottom().value() != static_cast<int>(style.borderBottomWidth())) {
+            style.setBorderBottomWidth(borderBox.bottom().value());
             if (borderBox.bottom().value())
-                style->setBorderBottomWidth(borderBox.bottom().value());
+                style.setBorderBottomWidth(borderBox.bottom().value());
             else
-                style->resetBorderBottom();
+                style.resetBorderBottom();
         }
-        if (borderBox.left().value() != static_cast<int>(style->borderLeftWidth())) {
-            style->setBorderLeftWidth(borderBox.left().value());
+        if (borderBox.left().value() != static_cast<int>(style.borderLeftWidth())) {
+            style.setBorderLeftWidth(borderBox.left().value());
             if (borderBox.left().value())
-                style->setBorderLeftWidth(borderBox.left().value());
+                style.setBorderLeftWidth(borderBox.left().value());
             else
-                style->resetBorderLeft();
+                style.resetBorderLeft();
         }
 
         // Padding
-        LengthBox paddingBox = m_platformTheme->controlPadding(part, style->font().fontDescription(), style->paddingBox(), style->effectiveZoom());
-        if (paddingBox != style->paddingBox())
-            style->setPaddingBox(paddingBox);
+        LengthBox paddingBox = m_platformTheme->controlPadding(part, style.font().fontDescription(), style.paddingBox(), style.effectiveZoom());
+        if (paddingBox != style.paddingBox())
+            style.setPaddingBox(paddingBox);
 
         // Whitespace
         if (m_platformTheme->controlRequiresPreWhiteSpace(part))
-            style->setWhiteSpace(PRE);
+            style.setWhiteSpace(PRE);
 
         // Width / Height
         // The width and height here are affected by the zoom.
         // FIXME: Check is flawed, since it doesn't take min-width/max-width into account.
-        LengthSize controlSize = m_platformTheme->controlSize(part, style->font().fontDescription(), LengthSize(style->width(), style->height()), style->effectiveZoom());
-        if (controlSize.width() != style->width())
-            style->setWidth(controlSize.width());
-        if (controlSize.height() != style->height())
-            style->setHeight(controlSize.height());
+        LengthSize controlSize = m_platformTheme->controlSize(part, style.font().fontDescription(), LengthSize(style.width(), style.height()), style.effectiveZoom());
+        if (controlSize.width() != style.width())
+            style.setWidth(controlSize.width());
+        if (controlSize.height() != style.height())
+            style.setHeight(controlSize.height());
 
         // Min-Width / Min-Height
-        LengthSize minControlSize = m_platformTheme->minimumControlSize(part, style->font().fontDescription(), style->effectiveZoom());
-        if (minControlSize.width() != style->minWidth())
-            style->setMinWidth(minControlSize.width());
-        if (minControlSize.height() != style->minHeight())
-            style->setMinHeight(minControlSize.height());
+        LengthSize minControlSize = m_platformTheme->minimumControlSize(part, style.font().fontDescription(), style.effectiveZoom());
+        if (minControlSize.width() != style.minWidth())
+            style.setMinWidth(minControlSize.width());
+        if (minControlSize.height() != style.minHeight())
+            style.setMinHeight(minControlSize.height());
 
         // Font
-        FontDescription controlFont = m_platformTheme->controlFont(part, style->font().fontDescription(), style->effectiveZoom());
-        if (controlFont != style->font().fontDescription()) {
+        FontDescription controlFont = m_platformTheme->controlFont(part, style.font().fontDescription(), style.effectiveZoom());
+        if (controlFont != style.font().fontDescription()) {
             // Reset our line-height
-            style->setLineHeight(RenderStyle::initialLineHeight());
+            style.setLineHeight(RenderStyle::initialLineHeight());
 
             // Now update our font.
-            if (style->setFontDescription(controlFont))
-                style->font().update(nullptr);
+            if (style.setFontDescription(controlFont))
+                style.font().update(nullptr);
         }
     }
     default:
         break;
     }
 #endif
 
     // Call the appropriate style adjustment method based off the appearance value.
-    switch (style->appearance()) {
+    switch (style.appearance()) {
 #if !USE(NEW_THEME)
     case CheckboxPart:
         return adjustCheckboxStyle(style, e);
     case RadioPart:
         return adjustRadioStyle(style, e);
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
         return adjustButtonStyle(style, e);
     case InnerSpinButtonPart:
@@ skipping 14 matching lines @@
         return adjustSearchFieldDecorationStyle(style, e);
     case SearchFieldResultsDecorationPart:
         return adjustSearchFieldResultsDecorationStyle(style, e);
     default:
         break;
     }
 }
 
 bool LayoutTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    ControlPart part = o->style()->appearance();
+    ControlPart part = o->styleRef().appearance();
 
-    if (shouldUseFallbackTheme(o->style()))
+    if (shouldUseFallbackTheme(o->styleRef()))
         return paintUsingFallbackTheme(o, paintInfo, r);
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case RadioPart:
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case InnerSpinButtonPart:
-        m_platformTheme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
+        m_platformTheme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->styleRef().effectiveZoom(), o->view()->frameView());
         return false;
     default:
         break;
     }
 #endif
 
     // Call the appropriate paint method based off the appearance value.
     switch (part) {
 #if !USE(NEW_THEME)
     case CheckboxPart:
@@ skipping 295 matching lines @@
     backgroundCopy.setRepeatX(NoRepeatFill);
     backgroundCopy.setRepeatY(NoRepeatFill);
     backgroundLayersCopy.setRepeatX(NoRepeatFill);
     backgroundLayersCopy.setRepeatY(NoRepeatFill);
     // Test the style to see if the UA border and background match.
     return style.border() != uaStyle.border
         || backgroundLayersCopy != backgroundCopy
         || style.visitedDependentColor(CSSPropertyBackgroundColor) != uaStyle.backgroundColor;
 }
 
-bool LayoutTheme::isControlStyled(const RenderStyle* style, const CachedUAStyle* uaStyle) const
+bool LayoutTheme::isControlStyled(const RenderStyle& style, const CachedUAStyle* uaStyle) const

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

Make uaStyle a ref as well? We immediately ASSERT(uaStyle)

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

That's a good point. However it's unclear if uaStyle is non-NULL in the whole
code path so I would rather be consistent and stick to pointers.

 {
     ASSERT(uaStyle);
 
-    switch (style->appearance()) {
+    switch (style.appearance()) {
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case ProgressBarPart:
     case MeterPart:
     case RelevancyLevelIndicatorPart:
     case ContinuousCapacityLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
-        return isBackgroundOrBorderStyled(*style, *uaStyle);
+        return isBackgroundOrBorderStyled(style, *uaStyle);
 
     case MenulistPart:
     case SearchFieldPart:
     case TextAreaPart:
     case TextFieldPart:
-        return isBackgroundOrBorderStyled(*style, *uaStyle) || style->boxShadow();
+        return isBackgroundOrBorderStyled(style, *uaStyle) || style.boxShadow();
 
     case SliderHorizontalPart:
     case SliderVerticalPart:
-        return style->boxShadow();
+        return style.boxShadow();
 
     default:
         return false;
     }
 }
 
 void LayoutTheme::adjustPaintInvalidationRect(const RenderObject* o, IntRect& r)
 {
 #if USE(NEW_THEME)
     m_platformTheme->inflateControlPaintRect(o->style()->appearance(), controlStatesForRenderer(o), r, o->style()->effectiveZoom());
 #endif
 }
 
 bool LayoutTheme::shouldDrawDefaultFocusRing(RenderObject* renderer) const
 {
-    if (supportsFocusRing(renderer->style()))
+    if (supportsFocusRing(renderer->styleRef()))
         return false;
     Node* node = renderer->node();
     if (!node)
         return true;
-    if (!renderer->style()->hasAppearance() && !node->isLink())
+    if (!renderer->styleRef().hasAppearance() && !node->isLink())
         return true;
     // We can't use LayoutTheme::isFocused because outline:auto might be
     // specified to non-:focus rulesets.
     if (node->focused() && !node->shouldHaveFocusAppearance())
         return false;
     return true;
 }
 
-bool LayoutTheme::supportsFocusRing(const RenderStyle* style) const
+bool LayoutTheme::supportsFocusRing(const RenderStyle& style) const
 {
-    return (style->hasAppearance() && style->appearance() != TextFieldPart && style->appearance() != TextAreaPart && style->appearance() != MenulistButtonPart && style->appearance() != ListboxPart);
+    return (style.hasAppearance() && style.appearance() != TextFieldPart && style.appearance() != TextAreaPart && style.appearance() != MenulistButtonPart && style.appearance() != ListboxPart);
 }
 
 bool LayoutTheme::stateChanged(RenderObject* o, ControlState state) const
 {
     // Default implementation assumes the controls don't respond to changes in :hover state
-    if (state == HoverControlState && !supportsHover(o->style()))
+    if (state == HoverControlState && !supportsHover(o->styleRef()))
         return false;
 
     // Assume pressed state is only responded to if the control is enabled.
     if (state == PressedControlState && !isEnabled(o))
         return false;
 
     o->setShouldDoFullPaintInvalidation();
     return true;
 }
 
@@ skipping 113 matching lines @@
 {
     Node* node = o->node();
     if (!node || !node->isElementNode() || !toElement(node)->isSpinButtonElement())
         return false;
     SpinButtonElement* element = toSpinButtonElement(node);
     return element->upDownState() == SpinButtonElement::Up;
 }
 
 #if !USE(NEW_THEME)
 
-void LayoutTheme::adjustCheckboxStyle(RenderStyle* style, Element*) const
+void LayoutTheme::adjustCheckboxStyle(RenderStyle& style, Element*) const
 {
     // A summary of the rules for checkbox designed to match WinIE:
     // width/height - honored (WinIE actually scales its control for small widths, but lets it overflow for small heights.)
     // font-size - not honored (control has no text), but we use it to decide which control size to use.
     setCheckboxSize(style);
 
     // padding - not honored by WinIE, needs to be removed.
-    style->resetPadding();
+    style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
-    style->resetBorder();
+    style.resetBorder();
 }
 
-void LayoutTheme::adjustRadioStyle(RenderStyle* style, Element*) const
+void LayoutTheme::adjustRadioStyle(RenderStyle& style, Element*) const
 {
     // A summary of the rules for checkbox designed to match WinIE:
     // width/height - honored (WinIE actually scales its control for small widths, but lets it overflow for small heights.)
     // font-size - not honored (control has no text), but we use it to decide which control size to use.
     setRadioSize(style);
 
     // padding - not honored by WinIE, needs to be removed.
-    style->resetPadding();
+    style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
-    style->resetBorder();
+    style.resetBorder();
 }
 
-void LayoutTheme::adjustButtonStyle(RenderStyle* style, Element*) const
+void LayoutTheme::adjustButtonStyle(RenderStyle& style, Element*) const
 {
 }
 
-void LayoutTheme::adjustInnerSpinButtonStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustInnerSpinButtonStyle(RenderStyle&, Element*) const
 {
 }
 #endif
 
-void LayoutTheme::adjustMenuListStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustMenuListStyle(RenderStyle&, Element*) const
 {
 }
 
 IntSize LayoutTheme::meterSizeForBounds(const RenderMeter*, const IntRect& bounds) const
 {
     return bounds.size();
 }
 
 bool LayoutTheme::supportsMeter(ControlPart) const
 {
@@ skipping 23 matching lines @@
     double max = input->maximum();
     ControlPart part = o->style()->appearance();
     // We don't support ticks on alternate sliders like MediaVolumeSliders.
     if (part !=  SliderHorizontalPart && part != SliderVerticalPart)
         return;
     bool isHorizontal = part ==  SliderHorizontalPart;
 
     IntSize thumbSize;
     RenderObject* thumbRenderer = input->userAgentShadowRoot()->getElementById(ShadowElementNames::sliderThumb())->renderer();
     if (thumbRenderer) {
-        RenderStyle* thumbStyle = thumbRenderer->style();
-        int thumbWidth = thumbStyle->width().intValue();
-        int thumbHeight = thumbStyle->height().intValue();
+        const RenderStyle& thumbStyle = thumbRenderer->styleRef();
+        int thumbWidth = thumbStyle.width().intValue();
+        int thumbHeight = thumbStyle.height().intValue();
         thumbSize.setWidth(isHorizontal ? thumbWidth : thumbHeight);
         thumbSize.setHeight(isHorizontal ? thumbHeight : thumbWidth);
     }
 
     IntSize tickSize = sliderTickSize();
     float zoomFactor = o->style()->effectiveZoom();
     FloatRect tickRect;
     int tickRegionSideMargin = 0;
     int tickRegionWidth = 0;
     IntRect trackBounds;
@@ skipping 45 matching lines @@
 double LayoutTheme::animationDurationForProgressBar(RenderProgress*) const
 {
     return 0;
 }
 
 bool LayoutTheme::shouldHaveSpinButton(HTMLInputElement* inputElement) const
 {
     return inputElement->isSteppable() && inputElement->type() != InputTypeNames::range;
 }
 
-void LayoutTheme::adjustMenuListButtonStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustMenuListButtonStyle(RenderStyle&, Element*) const
 {
 }
 
-void LayoutTheme::adjustSliderThumbStyle(RenderStyle* style, Element* element) const
+void LayoutTheme::adjustSliderThumbStyle(RenderStyle& style, Element* element) const
 {
     adjustSliderThumbSize(style, element);
 }
 
-void LayoutTheme::adjustSliderThumbSize(RenderStyle*, Element*) const
+void LayoutTheme::adjustSliderThumbSize(RenderStyle&, Element*) const
 {
 }
 
-void LayoutTheme::adjustSearchFieldStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustSearchFieldStyle(RenderStyle&, Element*) const
 {
 }
 
-void LayoutTheme::adjustSearchFieldCancelButtonStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustSearchFieldCancelButtonStyle(RenderStyle&, Element*) const
 {
 }
 
-void LayoutTheme::adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustSearchFieldDecorationStyle(RenderStyle&, Element*) const
 {
 }
 
-void LayoutTheme::adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const
+void LayoutTheme::adjustSearchFieldResultsDecorationStyle(RenderStyle&, Element*) const
 {
 }
 
 void LayoutTheme::platformColorsDidChange()
 {
     Page::platformColorsChanged();
 }
 
 static FontDescription& getCachedFontDescription(CSSValueID systemFontID)
 {
@@ skipping 186 matching lines @@
 bool LayoutTheme::supportsCalendarPicker(const AtomicString& type) const
 {
     return type == InputTypeNames::date
         || type == InputTypeNames::datetime
         || type == InputTypeNames::datetime_local
         || type == InputTypeNames::month
         || type == InputTypeNames::week;
 }
 #endif
 
-bool LayoutTheme::shouldUseFallbackTheme(RenderStyle*) const
+bool LayoutTheme::shouldUseFallbackTheme(const RenderStyle&) const
 {
     return false;
 }
 
-void LayoutTheme::adjustStyleUsingFallbackTheme(RenderStyle* style, Element* e)
+void LayoutTheme::adjustStyleUsingFallbackTheme(RenderStyle& style, Element* e)
 {
-    ControlPart part = style->appearance();
+    ControlPart part = style.appearance();
     switch (part) {
     case CheckboxPart:
         return adjustCheckboxStyleUsingFallbackTheme(style, e);
     case RadioPart:
         return adjustRadioStyleUsingFallbackTheme(style, e);
     default:
         break;
     }
 }
 
 bool LayoutTheme::paintUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
 {
     ControlPart part = o->style()->appearance();
     switch (part) {
     case CheckboxPart:
         return paintCheckboxUsingFallbackTheme(o, i, r);
     case RadioPart:
         return paintRadioUsingFallbackTheme(o, i, r);
     default:
         break;
     }
     return true;
 }
 
 // static
-void LayoutTheme::setSizeIfAuto(RenderStyle* style, const IntSize& size)
+void LayoutTheme::setSizeIfAuto(RenderStyle& style, const IntSize& size)
 {
-    if (style->width().isIntrinsicOrAuto())
-        style->setWidth(Length(size.width(), Fixed));
-    if (style->height().isAuto())
-        style->setHeight(Length(size.height(), Fixed));
+    if (style.width().isIntrinsicOrAuto())
+        style.setWidth(Length(size.width(), Fixed));
+    if (style.height().isAuto())
+        style.setHeight(Length(size.height(), Fixed));
 }
 
 bool LayoutTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
 {
     WebFallbackThemeEngine::ExtraParams extraParams;
     WebCanvas* canvas = i.context->canvas();
     extraParams.button.checked = isChecked(o);
     extraParams.button.indeterminate = isIndeterminate(o);
 
     float zoomLevel = o->style()->effectiveZoom();
     GraphicsContextStateSaver stateSaver(*i.context);
     IntRect unzoomedRect = r;
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         i.context->translate(unzoomedRect.x(), unzoomedRect.y());
         i.context->scale(zoomLevel, zoomLevel);
         i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Platform::current()->fallbackThemeEngine()->paint(canvas, WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
-void LayoutTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Element*) const
+void LayoutTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle& style, Element*) 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;
 
     IntSize size = Platform::current()->fallbackThemeEngine()->getSize(WebFallbackThemeEngine::PartCheckbox);
-    float zoomLevel = style->effectiveZoom();
+    float zoomLevel = style.effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 
     // padding - not honored by WinIE, needs to be removed.
-    style->resetPadding();
+    style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
-    style->resetBorder();
+    style.resetBorder();
 }
 
 bool LayoutTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
 {
     WebFallbackThemeEngine::ExtraParams extraParams;
     WebCanvas* canvas = i.context->canvas();
     extraParams.button.checked = isChecked(o);
     extraParams.button.indeterminate = isIndeterminate(o);
 
     float zoomLevel = o->style()->effectiveZoom();
     GraphicsContextStateSaver stateSaver(*i.context);
     IntRect unzoomedRect = r;
     if (zoomLevel != 1) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         i.context->translate(unzoomedRect.x(), unzoomedRect.y());
         i.context->scale(zoomLevel, zoomLevel);
         i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Platform::current()->fallbackThemeEngine()->paint(canvas, WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
-void LayoutTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle* style, Element*) const
+void LayoutTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle& style, Element*) 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;
 
     IntSize size = Platform::current()->fallbackThemeEngine()->getSize(WebFallbackThemeEngine::PartRadio);
-    float zoomLevel = style->effectiveZoom();
+    float zoomLevel = style.effectiveZoom();
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     setSizeIfAuto(style, size);
 
     // padding - not honored by WinIE, needs to be removed.
-    style->resetPadding();
+    style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
-    style->resetBorder();
+    style.resetBorder();
 }
 
 } // namespace blink