Move rendering/RenderObject to layout/LayoutObject.

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 474 matching lines @@
         return true;
     // FIXME: NSSearchFieldCell doesn't work well when scaled.
     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)
+void LayoutThemeChromiumMac::adjustPaintInvalidationRect(const LayoutObject* o, IntRect& r)
 {
     ControlPart part = o->style()->appearance();
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case RadioPart:
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
@@ skipping 10 matching lines @@
         setPopupButtonCellState(o, r);
         IntSize size = popupButtonSizes()[[popupButton() controlSize]];
         size.setHeight(size.height() * zoomLevel);
         size.setWidth(r.width());
         r = ThemeMac::inflateRect(r, size, popupButtonMargins(), zoomLevel);
     } else if (part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart) {
         r.setHeight(r.height() + sliderThumbShadowBlur);
     }
 }
 
-FloatRect LayoutThemeChromiumMac::convertToPaintingRect(const RenderObject* inputRenderer, const RenderObject* partRenderer, const FloatRect& inputRect, const IntRect& r) const
+FloatRect LayoutThemeChromiumMac::convertToPaintingRect(const LayoutObject* inputRenderer, const LayoutObject* partRenderer, const FloatRect& inputRect, const IntRect& r) const
 {
     FloatRect partRect(inputRect);
 
     // Compute an offset between the part renderer and the input renderer.
     FloatSize offsetFromInputRenderer;
-    const RenderObject* renderer = partRenderer;
+    const LayoutObject* renderer = partRenderer;
     while (renderer && renderer != inputRenderer) {
-        RenderObject* containingRenderer = renderer->container();
+        LayoutObject* containingRenderer = renderer->container();
         offsetFromInputRenderer -= roundedIntSize(renderer->offsetFromContainer(containingRenderer, LayoutPoint()));
         renderer = containingRenderer;
     }
     // If the input renderer was not a container, something went wrong.
     ASSERT(renderer == inputRenderer);
     // Move the rect into partRenderer's coords.
     partRect.move(offsetFromInputRenderer);
     // Account for the local drawing offset (tx, ty).
     partRect.move(r.x(), r.y());
 
     return partRect;
 }
 
-void LayoutThemeChromiumMac::updateCheckedState(NSCell* cell, const RenderObject* o)
+void LayoutThemeChromiumMac::updateCheckedState(NSCell* cell, const LayoutObject* o)
 {
     bool oldIndeterminate = [cell state] == NSMixedState;
     bool indeterminate = isIndeterminate(o);
     bool checked = isChecked(o);
 
     if (oldIndeterminate != indeterminate) {
         [cell setState:indeterminate ? NSMixedState : (checked ? NSOnState : NSOffState)];
         return;
     }
 
     bool oldChecked = [cell state] == NSOnState;
     if (checked != oldChecked)
         [cell setState:checked ? NSOnState : NSOffState];
 }
 
-void LayoutThemeChromiumMac::updateEnabledState(NSCell* cell, const RenderObject* o)
+void LayoutThemeChromiumMac::updateEnabledState(NSCell* cell, const LayoutObject* o)
 {
     bool oldEnabled = [cell isEnabled];
     bool enabled = isEnabled(o);
     if (enabled != oldEnabled)
         [cell setEnabled:enabled];
 }
 
-void LayoutThemeChromiumMac::updateFocusedState(NSCell* cell, const RenderObject* o)
+void LayoutThemeChromiumMac::updateFocusedState(NSCell* cell, const LayoutObject* o)
 {
     bool oldFocused = [cell showsFirstResponder];
     bool focused = isFocused(o) && o->style()->outlineStyleIsAuto();
     if (focused != oldFocused)
         [cell setShowsFirstResponder:focused];
 }
 
-void LayoutThemeChromiumMac::updatePressedState(NSCell* cell, const RenderObject* o)
+void LayoutThemeChromiumMac::updatePressedState(NSCell* cell, const LayoutObject* o)
 {
     bool oldPressed = [cell isHighlighted];
     bool pressed = o->node() && o->node()->active();
     if (pressed != oldPressed)
         [cell setHighlighted:pressed];
 }
 
 NSControlSize LayoutThemeChromiumMac::controlSizeForFont(RenderStyle* style) const
 {
     int fontSize = style->fontSize();
@@ skipping 87 matching lines @@
     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)
+bool LayoutThemeChromiumMac::paintTextField(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     LocalCurrentGraphicsContext localContext(paintInfo.context, r);
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1070
     bool useNSTextFieldCell = o->style()->hasAppearance()
         && o->style()->visitedDependentColor(CSSPropertyBackgroundColor) == Color::white
         && !o->style()->hasBackgroundImage();
 
     // We do not use NSTextFieldCell to draw styled text fields on Lion and
     // SnowLeopard because there are a number of bugs on those platforms that
@@ skipping 11 matching lines @@
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
     [textField setEnabled:(isEnabled(o) && !isReadOnlyControl(o))];
     [textField drawWithFrame:NSRect(r) inView:documentViewFor(o)];
 
     [textField setControlView:nil];
 
     return false;
 }
 
-bool LayoutThemeChromiumMac::paintCapsLockIndicator(RenderObject*, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintCapsLockIndicator(LayoutObject*, const PaintInfo& paintInfo, const IntRect& r)
 {
     // This draws the caps lock indicator as it was done by
     // WKDrawCapsLockIndicator.
     LocalCurrentGraphicsContext localContext(paintInfo.context, r);
     CGContextRef c = localContext.cgContext();
     CGMutablePathRef shape = CGPathCreateMutable();
 
     // To draw the caps lock indicator, draw the shape into a small
     // square that is then scaled to the size of r.
     const CGFloat kSquareSize = 17;
@@ skipping 40 matching lines @@
 
     CGContextSetRGBFillColor(c, 0, 0, 0, 0.4);
     CGContextBeginPath(c);
     CGContextAddPath(c, paintPath);
     CGContextFillPath(c);
     CGPathRelease(paintPath);
 
     return false;
 }
 
-bool LayoutThemeChromiumMac::paintTextArea(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintTextArea(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     LocalCurrentGraphicsContext localContext(paintInfo.context, r);
     _NSDrawCarbonThemeListBox(r, isEnabled(o) && !isReadOnlyControl(o), YES, YES);
     return false;
 }
 
 const int* LayoutThemeChromiumMac::popupButtonMargins() const
 {
     static const int margins[3][4] =
     {
@@ skipping 14 matching lines @@
 {
     static const int padding[3][4] =
     {
         { 2, 26, 3, 8 },
         { 2, 23, 3, 8 },
         { 2, 22, 3, 10 }
     };
     return padding[size];
 }
 
-bool LayoutThemeChromiumMac::paintMenuList(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintMenuList(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     setPopupButtonCellState(o, r);
 
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     float zoomLevel = o->style()->effectiveZoom();
     IntSize size = popupButtonSizes()[[popupButton controlSize]];
     size.setHeight(size.height() * zoomLevel);
     size.setWidth(r.width());
 
@@ skipping 33 matching lines @@
     if (NoControlPart == renderMeter->style()->appearance())
         return bounds.size();
 
     NSLevelIndicatorCell* cell = levelIndicatorFor(renderMeter);
     // Makes enough room for cell's intrinsic size.
     NSSize cellSize = [cell cellSizeForBounds:IntRect(IntPoint(), bounds.size())];
     return IntSize(bounds.width() < cellSize.width ? cellSize.width : bounds.width(),
                    bounds.height() < cellSize.height ? cellSize.height : bounds.height());
 }
 
-bool LayoutThemeChromiumMac::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMeter(LayoutObject* layoutObject, const PaintInfo& paintInfo, const IntRect& rect)
 {
-    if (!renderObject->isMeter())
+    if (!layoutObject->isMeter())
         return true;
 
     LocalCurrentGraphicsContext localContext(paintInfo.context, rect);
 
-    NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(renderObject));
+    NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(layoutObject));
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
-    [cell drawWithFrame:rect inView:documentViewFor(renderObject)];
+    [cell drawWithFrame:rect inView:documentViewFor(layoutObject)];
     [cell setControlView:nil];
     return false;
 }
 
 bool LayoutThemeChromiumMac::supportsMeter(ControlPart part) const
 {
     switch (part) {
     case RelevancyLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
@@ skipping 89 matching lines @@
 double LayoutThemeChromiumMac::animationRepeatIntervalForProgressBar(RenderProgress*) const
 {
     return progressAnimationFrameRate;
 }
 
 double LayoutThemeChromiumMac::animationDurationForProgressBar(RenderProgress*) const
 {
     return progressAnimationNumFrames * progressAnimationFrameRate;
 }
 
-bool LayoutThemeChromiumMac::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintProgressBar(LayoutObject* layoutObject, const PaintInfo& paintInfo, const IntRect& rect)
 {
-    if (!renderObject->isProgress())
+    if (!layoutObject->isProgress())
         return true;
 
-    float zoomLevel = renderObject->style()->effectiveZoom();
-    int controlSize = controlSizeForFont(renderObject->style());
+    float zoomLevel = layoutObject->style()->effectiveZoom();
+    int controlSize = controlSizeForFont(layoutObject->style());
     IntSize size = progressBarSizes()[controlSize];
     size.setHeight(size.height() * zoomLevel);
     size.setWidth(rect.width());
 
     // Now inflate it to account for the shadow.
     IntRect inflatedRect = rect;
-    if (rect.height() <= minimumProgressBarHeight(renderObject->style()))
+    if (rect.height() <= minimumProgressBarHeight(layoutObject->style()))
         inflatedRect = ThemeMac::inflateRect(inflatedRect, size, progressBarMargins(controlSize), zoomLevel);
 
-    RenderProgress* renderProgress = toRenderProgress(renderObject);
+    RenderProgress* renderProgress = toRenderProgress(layoutObject);
     HIThemeTrackDrawInfo trackInfo;
     trackInfo.version = 0;
     if (controlSize == NSRegularControlSize)
         trackInfo.kind = renderProgress->position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
     else
         trackInfo.kind = renderProgress->position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
 
     trackInfo.bounds = IntRect(IntPoint(), inflatedRect.size());
     trackInfo.min = 0;
     trackInfo.max = std::numeric_limits<SInt32>::max();
     trackInfo.value = lround(renderProgress->position() * nextafter(trackInfo.max, 0));
     trackInfo.trackInfo.progress.phase = lround(renderProgress->animationProgress() * nextafter(progressAnimationNumFrames, 0));
     trackInfo.attributes = kThemeTrackHorizontal;
-    trackInfo.enableState = isActive(renderObject) ? kThemeTrackActive : kThemeTrackInactive;
+    trackInfo.enableState = isActive(layoutObject) ? kThemeTrackActive : kThemeTrackInactive;
     trackInfo.reserved = 0;
     trackInfo.filler1 = 0;
 
     OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(inflatedRect.size());
     if (!imageBuffer)
         return true;
 
     LocalCurrentGraphicsContext localContext(imageBuffer->context(), IntRect(IntPoint(), inflatedRect.size()));
     CGContextRef cgContext = localContext.cgContext();
     HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
@@ skipping 15 matching lines @@
 const float baseArrowWidth = 5.0f;
 const float baseSpaceBetweenArrows = 2.0f;
 const int arrowPaddingLeft = 6;
 const int arrowPaddingRight = 6;
 const int paddingBeforeSeparator = 4;
 const int baseBorderRadius = 5;
 const int styledPopupPaddingLeft = 8;
 const int styledPopupPaddingTop = 1;
 const int styledPopupPaddingBottom = 2;
 
-bool LayoutThemeChromiumMac::paintMenuListButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintMenuListButton(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     IntRect bounds = IntRect(r.x() + o->style()->borderLeftWidth(),
                              r.y() + o->style()->borderTopWidth(),
                              r.width() - o->style()->borderLeftWidth() - o->style()->borderRightWidth(),
                              r.height() - o->style()->borderTopWidth() - o->style()->borderBottomWidth());
     // Since we actually know the size of the control here, we restrict the font
     // scale to make sure the arrows will fit vertically in the bounds
     float fontScale = std::min(o->style()->fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
     float centerY = bounds.y() + bounds.height() / 2.0f;
     float arrowHeight = baseArrowHeight * fontScale;
@@ skipping 117 matching lines @@
 
     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(RenderStyle::initialLineHeight());
 }
 
-void LayoutThemeChromiumMac::setPopupButtonCellState(const RenderObject* o, const IntRect& r)
+void LayoutThemeChromiumMac::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);
@@ skipping 10 matching lines @@
 }
 
 int LayoutThemeChromiumMac::minimumMenuListSize(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)
+bool LayoutThemeChromiumMac::paintSliderTrack(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     paintSliderTicks(o, paintInfo, r);
 
     float zoomLevel = o->style()->effectiveZoom();
     FloatRect unzoomedRect = r;
 
     if (o->style()->appearance() ==  SliderHorizontalPart || o->style()->appearance() ==  MediaSliderPart) {
         unzoomedRect.setY(ceilf(unzoomedRect.y() + unzoomedRect.height() / 2 - zoomLevel * sliderTrackWidth / 2));
         unzoomedRect.setHeight(zoomLevel * sliderTrackWidth);
     } else if (o->style()->appearance() == SliderVerticalPart) {
@@ skipping 59 matching lines @@
     paintInfo.context->setStrokeGradient(borderGradient);
     paintInfo.context->setStrokeThickness(sliderTrackBorderWidth);
     paintInfo.context->strokePath(borderPath);
     return false;
 }
 
 const int sliderThumbWidth = 15;
 const int sliderThumbHeight = 15;
 const int sliderThumbBorderWidth = 1;
 
-bool LayoutThemeChromiumMac::paintSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintSliderThumb(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
     float zoomLevel = o->style()->effectiveZoom();
 
     FloatRect unzoomedRect(r.x(), r.y(), sliderThumbWidth, sliderThumbHeight);
     if (zoomLevel != 1.0f) {
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(zoomLevel, zoomLevel);
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
@@ skipping 54 matching lines @@
 
     if (isFocused(o)) {
         Path borderPath;
         borderPath.addEllipse(borderBounds);
         paintInfo.context->drawFocusRing(borderPath, 5, -2, focusRingColor());
     }
 
     return false;
 }
 
-bool LayoutThemeChromiumMac::paintSearchField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintSearchField(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     LocalCurrentGraphicsContext localContext(paintInfo.context, r);
 
     NSSearchFieldCell* search = this->search();
     setSearchCellState(o, r);
     [search setControlSize:searchFieldControlSizeForFont(o->style())];
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
     float zoomLevel = o->style()->effectiveZoom();
@@ skipping 13 matching lines @@
     [search setSearchButtonCell:nil];
 
     [search drawWithFrame:NSRect(unzoomedRect) inView:documentViewFor(o)];
 
     [search setControlView:nil];
     [search resetSearchButtonCell];
 
     return false;
 }
 
-void LayoutThemeChromiumMac::setSearchCellState(RenderObject* o, const IntRect&)
+void LayoutThemeChromiumMac::setSearchCellState(LayoutObject* o, const IntRect&)
 {
     NSSearchFieldCell* search = this->search();
 
     // Update the various states we respond to.
     updateActiveState(search, o);
     updateEnabledState(search, o);
     updateFocusedState(search, o);
 }
 
 const IntSize* LayoutThemeChromiumMac::searchFieldSizes() const
@@ skipping 45 matching lines @@
     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);
 }
 
-bool LayoutThemeChromiumMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintSearchFieldCancelButton(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     if (!o->node())
         return false;
     Element* input = o->node()->shadowHost();
     if (!input)
         input = toElement(o->node());
 
     if (!input->renderer()->isBox())
         return false;
 
@@ skipping 66 matching lines @@
 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);
 }
 
-bool LayoutThemeChromiumMac::paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&)
+bool LayoutThemeChromiumMac::paintSearchFieldDecoration(LayoutObject*, const PaintInfo&, const IntRect&)
 {
     return false;
 }
 
 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);
 }
 
-bool LayoutThemeChromiumMac::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumMac::paintSearchFieldResultsDecoration(LayoutObject* 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())
         return false;
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
@@ skipping 136 matching lines @@
 PassRefPtr<LayoutTheme> LayoutThemeChromiumMac::create()
 {
     return adoptRef(new LayoutThemeChromiumMac);
 }
 
 bool LayoutThemeChromiumMac::usesTestModeFocusRingColor() const
 {
     return LayoutTestSupport::isRunningLayoutTest();
 }
 
-NSView* LayoutThemeChromiumMac::documentViewFor(RenderObject*) const
+NSView* LayoutThemeChromiumMac::documentViewFor(LayoutObject*) const
 {
     return FlippedView();
 }
 
 // Updates the control tint (a.k.a. active state) of |cell| (from |o|).  In the
 // Chromium port, the renderer runs as a background process and controls'
 // NSCell(s) lack a parent NSView. Therefore controls don't have their tint
 // color updated correctly when the application is activated/deactivated.
 // FocusController's setActive() is called when the application is
 // activated/deactivated, which causes a paint invalidation at which time this
 // code is called.
 // This function should be called before drawing any NSCell-derived controls,
 // unless you're sure it isn't needed.
-void LayoutThemeChromiumMac::updateActiveState(NSCell* cell, const RenderObject* o)
+void LayoutThemeChromiumMac::updateActiveState(NSCell* cell, const LayoutObject* o)
 {
     NSControlTint oldTint = [cell controlTint];
     NSControlTint tint = isActive(o) ? [NSColor currentControlTint] :
                                        static_cast<NSControlTint>(NSClearControlTint);
 
     if (tint != oldTint)
         [cell setControlTint:tint];
 }
 
 bool LayoutThemeChromiumMac::shouldShowPlaceholderWhenFocused() const
 {
     return true;
 }
 
 void LayoutThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const
 {
     RenderMediaControls::adjustMediaSliderThumbSize(style);
 }
 
-bool LayoutThemeChromiumMac::paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaPlayButton(LayoutObject* 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)
+bool LayoutThemeChromiumMac::paintMediaOverlayPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaOverlayPlayButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumMac::paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaMuteButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaSliderTrack(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaSlider, object, paintInfo, rect);
 }
 
 String LayoutThemeChromiumMac::extraFullScreenStyleSheet()
 {
     // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
     return String();
 }
 
 String LayoutThemeChromiumMac::extraDefaultStyleSheet()
 {
     return LayoutTheme::extraDefaultStyleSheet() +
         loadResourceAsASCIIString("themeChromium.css") +
         loadResourceAsASCIIString("themeInputMultipleFields.css") +
         loadResourceAsASCIIString("themeMac.css");
 }
 
-bool LayoutThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaVolumeSliderContainer(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return true;
 }
 
-bool LayoutThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaVolumeSliderTrack(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaVolumeSlider, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumMac::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaVolumeSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaVolumeSliderThumb, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
 }
 
 String LayoutThemeChromiumMac::formatMediaControlsTime(float time) const
 {
     return RenderMediaControls::formatMediaControlsTime(time);
 }
 
 String LayoutThemeChromiumMac::formatMediaControlsCurrentTime(float currentTime, float duration) const
 {
     return RenderMediaControls::formatMediaControlsCurrentTime(currentTime, duration);
 }
 
-bool LayoutThemeChromiumMac::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumMac::paintMediaFullscreenButton(LayoutObject* 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)
+bool LayoutThemeChromiumMac::paintMediaToggleClosedCaptionsButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaShowClosedCaptionsButton, object, paintInfo, rect);
 }
 
 bool LayoutThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
 {
     ControlPart part = style->appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style->effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink