Rename adjustPaintInvalidationRect and related to addVisualOverflow

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 440 matching lines @@
     // like the control is styled.
     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)
         return true;
 
     return LayoutTheme::isControlStyled(style, authorStyle);
 }
 
-void LayoutThemeMac::adjustPaintInvalidationRect(const LayoutObject* o, IntRect& r)
+void LayoutThemeMac::addVisualOverflow(const LayoutObject& object, IntRect& rect)
 {
-    ControlPart part = o->style()->appearance();
+    ControlPart part = object.style()->appearance();
 
 #if USE(NEW_THEME)
     switch (part) {
     case CheckboxPart:
     case RadioPart:
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case InnerSpinButtonPart:
-        return LayoutTheme::adjustPaintInvalidationRect(o, r);
+        return LayoutTheme::addVisualOverflow(object, rect);
     default:
         break;
     }
 #endif
 
-    float zoomLevel = o->style()->effectiveZoom();
+    float zoomLevel = object.style()->effectiveZoom();
 
     if (part == MenulistPart) {
-        setPopupButtonCellState(o, r);
+        setPopupButtonCellState(&object, rect);
         IntSize size = popupButtonSizes()[[popupButton() controlSize]];
         size.setHeight(size.height() * zoomLevel);
-        size.setWidth(r.width());
-        r = ThemeMac::inflateRect(r, size, popupButtonMargins(), zoomLevel);
+        size.setWidth(rect.width());
+        rect = ThemeMac::inflateRect(rect, size, popupButtonMargins(), zoomLevel);
     } else if (part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart) {
-        r.setHeight(r.height() + sliderThumbShadowBlur);
+        rect.setHeight(rect.height() + sliderThumbShadowBlur);
     }
 }
 
 void LayoutThemeMac::updateCheckedState(NSCell* cell, const LayoutObject* o)
 {
     bool oldIndeterminate = [cell state] == NSMixedState;
     bool indeterminate = isIndeterminate(o);
     bool checked = isChecked(o);
 
     if (oldIndeterminate != indeterminate) {
@@ skipping 362 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(ComputedStyle::initialLineHeight());
 }
 
-void LayoutThemeMac::setPopupButtonCellState(const LayoutObject* o, const IntRect& r)
+void LayoutThemeMac::setPopupButtonCellState(const LayoutObject* object, const IntRect& rect)
 {
     NSPopUpButtonCell* popupButton = this->popupButton();
 
     // Set the control size based off the rectangle we're painting into.
-    setControlSize(popupButton, popupButtonSizes(), r.size(), o->style()->effectiveZoom());
+    setControlSize(popupButton, popupButtonSizes(), rect.size(), object->style()->effectiveZoom());
 
     // Update the various states we respond to.
-    updateActiveState(popupButton, o);
-    updateCheckedState(popupButton, o);
-    updateEnabledState(popupButton, o);
-    updatePressedState(popupButton, o);
+    updateActiveState(popupButton, object);
+    updateCheckedState(popupButton, object);
+    updateEnabledState(popupButton, object);
+    updatePressedState(popupButton, object);
     if (![popupButton respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)])
-        updateFocusedState(popupButton, o);
+        updateFocusedState(popupButton, object);
 }
 
 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 ComputedStyle& style) const
 {
@@ skipping 274 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink