mcHammer merge RenderThemeMac.mm

webkit/port/rendering/RenderThemeMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 40 matching lines @@
 typedef int NSInteger;
 typedef unsigned NSUInteger;
 #endif
 
 using std::min;
 
 // The methods in this file are specific to the Mac OS X platform.
 
 // FIXME: The platform-independent code in this class should be factored out and merged with RenderThemeSafari. 
 
-
 @interface WebCoreRenderThemeNotificationObserver : NSObject
 {
     WebCore::RenderTheme *_theme;
 }
 
 - (id)initWithTheme:(WebCore::RenderTheme *)theme;
 - (void)systemColorsDidChange:(NSNotification *)notification;
 
 @end
 
@@ skipping 27 matching lines @@
 };
 
 enum {
     topPadding,
     rightPadding,
     bottomPadding,
     leftPadding
 };
 
 // In our Mac port, we don't define PLATFORM(MAC) and thus don't pick up the
-// |operator NSRect()| on WebCore::IntRect and FloatRect. This substitues for that missing
-// conversion operator.
+// |operator NSRect()| on WebCore::IntRect and FloatRect. This substitues for
+// that missing conversion operator.
 NSRect IntRectToNSRect(const IntRect & rect)
 {
     return NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 NSRect FloatRectToNSRect(const FloatRect & rect)
 {
     return NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 IntRect NSRectToIntRect(const NSRect & rect)
 {
     return IntRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
 }
 
+
 RenderTheme* theme()
 {
     static RenderThemeMac* macTheme = new RenderThemeMac;
     return macTheme;
 }
 
 RenderThemeMac::RenderThemeMac()
     : m_isSliderThumbHorizontalPressed(false)
     , m_isSliderThumbVerticalPressed(false)
     , m_notificationObserver(AdoptNS, [[WebCoreRenderThemeNotificationObserver alloc] initWithTheme:this])
@@ skipping 295 matching lines @@
 
     if (color.isValid())
         m_systemColorCache.set(cssValueId, color.rgb());
 
     return color;
 }
 
 bool RenderThemeMac::isControlStyled(const RenderStyle* style, const BorderData& border,
                                      const FillLayer& background, const Color& backgroundColor) const
 {
-    if (style->appearance() == TextFieldAppearance || style->appearance() == TextAreaAppearance || style->appearance() == ListboxAppearance)
+    if (style->appearance() == TextFieldPart || style->appearance() == TextAreaPart || style->appearance() == ListboxPart)
         return style->border() != border;
     return RenderTheme::isControlStyled(style, border, background, backgroundColor);
 }
 
+// TODO(port): Use the code from the old upstream version, before it was converted to the new theme API in r37731.
 void RenderThemeMac::adjustRepaintRect(const RenderObject* o, IntRect& r)
 {
     float zoomLevel = o->style()->effectiveZoom();
 
     switch (o->style()->appearance()) {
-        case CheckboxAppearance: {
+        case CheckboxPart: {
             // Since we query the prototype cell, we need to update its state to match.
             setCheckboxCellState(o, r);
 
             // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
             // shadow" and the check.  We don't consider this part of the bounds of the control in WebKit.
             IntSize size = checkboxSizes()[[checkbox() controlSize]];
             size.setHeight(size.height() * zoomLevel);
             size.setWidth(size.width() * zoomLevel);
             r = inflateRect(r, size, checkboxMargins(), zoomLevel);
             break;
         }
-        case RadioAppearance: {
+        case RadioPart: {
             // Since we query the prototype cell, we need to update its state to match.
             setRadioCellState(o, r);
 
             // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
             // shadow" and the check.  We don't consider this part of the bounds of the control in WebKit.
             IntSize size = radioSizes()[[radio() controlSize]];
             size.setHeight(size.height() * zoomLevel);
             size.setWidth(size.width() * zoomLevel);
             r = inflateRect(r, size, radioMargins(), zoomLevel);
             break;
         }
-        case PushButtonAppearance:
-        case DefaultButtonAppearance:
-        case ButtonAppearance: {
+        case PushButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart: {
             // Since we query the prototype cell, we need to update its state to match.
             setButtonCellState(o, r);
 
             // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
             // shadow" and the check.  We don't consider this part of the bounds of the control in WebKit.
             if ([button() bezelStyle] == NSRoundedBezelStyle) {
                 IntSize size = buttonSizes()[[button() controlSize]];
                 size.setHeight(size.height() * zoomLevel);
                 size.setWidth(r.width());
                 r = inflateRect(r, size, buttonMargins(), zoomLevel);
             }
             break;
         }
-        case MenulistAppearance: {
+        case MenulistPart: {
             setPopupButtonCellState(o, r);
             IntSize size = popupButtonSizes()[[popupButton() controlSize]];
             size.setHeight(size.height() * zoomLevel);
             size.setWidth(r.width());
             r = inflateRect(r, size, popupButtonMargins(), zoomLevel);
             break;
         }
         default:
             break;
     }
@@ skipping 50 matching lines @@
 }
 
 void RenderThemeMac::updatePressedState(NSCell* cell, const RenderObject* o)
 {
     bool oldPressed = [cell isHighlighted];
     bool pressed = (o->element() && o->element()->active());
     if (pressed != oldPressed)
         [cell setHighlighted:pressed];
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 int RenderThemeMac::baselinePosition(const RenderObject* o) const
 {
-    if (o->style()->appearance() == CheckboxAppearance || o->style()->appearance() == RadioAppearance)
+    if (o->style()->appearance() == CheckboxPart || o->style()->appearance() == RadioPart)
         return o->marginTop() + o->height() - 2 * o->style()->effectiveZoom(); // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
     return RenderTheme::baselinePosition(o);
 }
 
 bool RenderThemeMac::controlSupportsTints(const RenderObject* o) const
 {
     // An alternate way to implement this would be to get the appropriate cell object
     // and call the private _needRedrawOnWindowChangedKeyState method. An advantage of
     // that would be that we would match AppKit behavior more closely, but a disadvantage
     // would be that we would rely on an AppKit SPI method.
 
     if (!isEnabled(o))
         return false;
 
     // Checkboxes only have tint when checked.
-    if (o->style()->appearance() == CheckboxAppearance)
+    if (o->style()->appearance() == CheckboxPart)
         return isChecked(o);
 
     // For now assume other controls have tint if enabled.
     return true;
 }
 
 NSControlSize RenderThemeMac::controlSizeForFont(RenderStyle* style) const
 {
     int fontSize = style->fontSize();
     if (fontSize >= 16)
@@ skipping 67 matching lines @@
 NSControlSize RenderThemeMac::controlSizeForSystemFont(RenderStyle* style) const
 {
     int fontSize = style->fontSize();
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
         return NSRegularControlSize;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 bool RenderThemeMac::paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     // Determine the width and height needed for the control and prepare the cell for painting.
     setCheckboxCellState(o, r);
 
     paintInfo.context->save();
 
     float zoomLevel = o->style()->effectiveZoom();
 
     // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
     // shadow" and the check.  We don't consider this part of the bounds of the control in WebKit.
     NSButtonCell* checkbox = this->checkbox();
     IntSize size = checkboxSizes()[[checkbox controlSize]];
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     IntRect inflatedRect = inflateRect(r, size, checkboxMargins(), zoomLevel);
     
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
         inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
         paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
     
-#if 0
-    [checkbox drawWithFrame:NSRect(IntRectToNSRect(inflatedRect)) inView:o->view()->frameView()->documentView()];
-#endif
+    [checkbox drawWithFrame:NSRect(IntRectToNSRect(inflatedRect)) inView:nil];
     [checkbox setControlView:nil];
 
     paintInfo.context->restore();
 
     return false;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const IntSize* RenderThemeMac::checkboxSizes() const
 {
     static const IntSize sizes[3] = { IntSize(14, 14), IntSize(12, 12), IntSize(10, 10) };
     return sizes;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const int* RenderThemeMac::checkboxMargins() const
 {
     static const int margins[3][4] =
     {
         { 3, 4, 4, 2 },
         { 4, 3, 3, 3 },
         { 4, 3, 3, 3 },
     };
     return margins[[checkbox() controlSize]];
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setCheckboxCellState(const RenderObject* o, const IntRect& r)
 {
     NSButtonCell* checkbox = this->checkbox();
 
     // Set the control size based off the rectangle we're painting into.
     setControlSize(checkbox, checkboxSizes(), r.size(), o->style()->effectiveZoom());
 
     // Update the various states we respond to.
     updateCheckedState(checkbox, o);
     updateEnabledState(checkbox, o);
     updatePressedState(checkbox, o);
     updateFocusedState(checkbox, o);
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setCheckboxSize(RenderStyle* 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, checkboxSizes());
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 bool RenderThemeMac::paintRadio(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     // Determine the width and height needed for the control and prepare the cell for painting.
     setRadioCellState(o, r);
 
     paintInfo.context->save();
 
     float zoomLevel = o->style()->effectiveZoom();
 
     // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
     // shadow" and the check.  We don't consider this part of the bounds of the control in WebKit.
     NSButtonCell* radio = this->radio();
     IntSize size = radioSizes()[[radio controlSize]];
     size.setWidth(size.width() * zoomLevel);
     size.setHeight(size.height() * zoomLevel);
     IntRect inflatedRect = inflateRect(r, size, radioMargins(), zoomLevel);
     
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
         inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
         paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [radio drawWithFrame:NSRect(IntRectToNSRect(inflatedRect)) inView:view];
+    [radio drawWithFrame:NSRect(IntRectToNSRect(inflatedRect)) inView:nil];
     [radio setControlView:nil];
 
     paintInfo.context->restore();
 
     return false;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const IntSize* RenderThemeMac::radioSizes() const
 {
     static const IntSize sizes[3] = { IntSize(14, 15), IntSize(12, 13), IntSize(10, 10) };
     return sizes;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const int* RenderThemeMac::radioMargins() const
 {
     static const int margins[3][4] =
     {
         { 2, 2, 4, 2 },
         { 3, 2, 3, 2 },
         { 1, 0, 2, 0 },
     };
     return margins[[radio() controlSize]];
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setRadioCellState(const RenderObject* o, const IntRect& r)
 {
     NSButtonCell* radio = this->radio();
 
     // Set the control size based off the rectangle we're painting into.
     setControlSize(radio, radioSizes(), r.size(), o->style()->effectiveZoom());
 
     // Update the various states we respond to.
     updateCheckedState(radio, o);
     updateEnabledState(radio, o);
     updatePressedState(radio, o);
     updateFocusedState(radio, o);
 }
 
-
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setRadioSize(RenderStyle* 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, radioSizes());
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setButtonPaddingFromControlSize(RenderStyle* style, NSControlSize size) const
 {
     // Just use 8px.  AppKit wants to use 11px for mini buttons, but that padding is just too large
     // for real-world Web sites (creating a huge necessary minimum width for buttons whose space is
     // by definition constrained, since we select mini only for small cramped environments.
     // This also guarantees the HTML4 <button> will match our rendering by default, since we're using a consistent
     // padding.
     const int padding = 8 * style->effectiveZoom();
     style->setPaddingLeft(Length(padding, Fixed));
     style->setPaddingRight(Length(padding, Fixed));
     style->setPaddingTop(Length(0, Fixed));
     style->setPaddingBottom(Length(0, Fixed));
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
     // There are three appearance constants for buttons.
     // (1) Push-button is the constant for the default Aqua system button.  Push buttons will not scale vertically and will not allow
     // custom fonts or colors.  <input>s use this constant.  This button will allow custom colors and font weights/variants but won't
     // scale vertically.
     // (2) square-button is the constant for the square button.  This button will allow custom fonts and colors and will scale vertically.
     // (3) Button is the constant that means "pick the best button as appropriate."  <button>s use this constant.  This button will
     // also scale vertically and allow custom fonts and colors.  It will attempt to use Aqua if possible and will make this determination
     // solely on the rectangle of the control.
 
     // Determine our control size based off our font.
     NSControlSize controlSize = controlSizeForFont(style);
 
-    if (style->appearance() == PushButtonAppearance) {
+    if (style->appearance() == PushButtonPart) {
         // Ditch the border.
         style->resetBorder();
 
         // Height is locked to auto.
         style->setHeight(Length(Auto));
 
         // White-space is locked to pre
         style->setWhiteSpace(PRE);
 
         // Set the button's vertical size.
@@ skipping 11 matching lines @@
         style->setMinHeight(Length(static_cast<int>(15 * style->effectiveZoom()), Fixed));
 
         // Reset the top and bottom borders.
         style->resetBorderTop();
         style->resetBorderBottom();
     }
 
     style->setBoxShadow(0);
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const IntSize* RenderThemeMac::buttonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
     return sizes;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 const int* RenderThemeMac::buttonMargins() const
 {
     static const int margins[3][4] =
     {
         { 4, 6, 7, 6 },
         { 4, 5, 6, 5 },
         { 0, 1, 1, 1 },
     };
     return margins[[button() controlSize]];
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setButtonSize(RenderStyle* 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, buttonSizes());
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 void RenderThemeMac::setButtonCellState(const RenderObject* o, const IntRect& r)
 {
     NSButtonCell* button = this->button();
 
     // Set the control size based off the rectangle we're painting into.
-    if (o->style()->appearance() == SquareButtonAppearance ||
+    if (o->style()->appearance() == SquareButtonPart ||
         r.height() > buttonSizes()[NSRegularControlSize].height() * o->style()->effectiveZoom()) {
         // Use the square button
         if ([button bezelStyle] != NSShadowlessSquareBezelStyle)
             [button setBezelStyle:NSShadowlessSquareBezelStyle];
     } else if ([button bezelStyle] != NSRoundedBezelStyle)
         [button setBezelStyle:NSRoundedBezelStyle];
 
     setControlSize(button, buttonSizes(), r.size(), o->style()->effectiveZoom());
 
-#if 0
-    NSWindow *window = [o->view()->frameView()->documentView() window];
+    NSWindow *window = [nil window];
     BOOL isDefaultButton = (isDefault(o) && [window isKeyWindow]);
     [button setKeyEquivalent:(isDefaultButton ? @"\r" : @"")];
-#endif
 
     // Update the various states we respond to.
     updateCheckedState(button, o);
     updateEnabledState(button, o);
     updatePressedState(button, o);
     updateFocusedState(button, o);
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 bool RenderThemeMac::paintButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     NSButtonCell* button = this->button();
     LocalCurrentGraphicsContext localContext(paintInfo.context);
 
     // Determine the width and height needed for the control and prepare the cell for painting.
     setButtonCellState(o, r);
 
     paintInfo.context->save();
 
@@ skipping 16 matching lines @@
 
         if (zoomLevel != 1.0f) {
             inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
             inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
             paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
             paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
             paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
         }
     } 
 
-#if 0
-    NSView *view = o->view()->frameView()->documentView();
-#endif
     NSView *view = nil;
     NSWindow *window = [view window];
     NSButtonCell *previousDefaultButtonCell = [window defaultButtonCell];
 
     if (isDefault(o) && [window isKeyWindow]) {
         [window setDefaultButtonCell:button];
         wkAdvanceDefaultButtonPulseAnimation(button);
     } else if ([previousDefaultButtonCell isEqual:button])
         [window setDefaultButtonCell:nil];
 
@@ skipping 93 matching lines @@
 #endif
 
     if (zoomLevel != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomLevel);
         inflatedRect.setHeight(inflatedRect.height() / zoomLevel);
         paintInfo.context->translate(inflatedRect.x(), inflatedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [popupButton drawWithFrame:IntRectToNSRect(inflatedRect) inView:view];
+    [popupButton drawWithFrame:IntRectToNSRect(inflatedRect) inView:nil];
     [popupButton setControlView:nil];
 
     paintInfo.context->restore();
 
     return false;
 }
 
 const float baseFontSize = 11.0f;
 const float baseArrowHeight = 4.0f;
 const float baseArrowWidth = 5.0f;
@@ skipping 165 matching lines @@
                                 IntPoint(leftEdgeOfSeparator, bounds.bottom()));
 
     paintInfo.context->setStrokeColor(rightSeparatorColor);
     paintInfo.context->drawLine(IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.y()),
                                 IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.bottom()));
 
     paintInfo.context->restore();
     return false;
 }
 
+static const IntSize* menuListButtonSizes()
+{
+    static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
+    return sizes;
+}
+
 void RenderThemeMac::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* 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
     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->isEnabled() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
 
     // Set the button's vertical size.
-    setButtonSize(style);
+    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(selector, style, controlSize);
 
     style->setBoxShadow(0);
 }
 
 int RenderThemeMac::popupInternalPaddingLeft(RenderStyle* style) const
 {
-    if (style->appearance() == MenulistAppearance)
+    if (style->appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[leftPadding] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonAppearance)
+    if (style->appearance() == MenulistButtonPart)
         return styledPopupPaddingLeft * style->effectiveZoom();
     return 0;
 }
 
 int RenderThemeMac::popupInternalPaddingRight(RenderStyle* style) const
 {
-    if (style->appearance() == MenulistAppearance)
+    if (style->appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[rightPadding] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonAppearance) {
+    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 RenderThemeMac::popupInternalPaddingTop(RenderStyle* style) const
 {
-    if (style->appearance() == MenulistAppearance)
+    if (style->appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[topPadding] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonAppearance)
+    if (style->appearance() == MenulistButtonPart)
         return styledPopupPaddingTop * style->effectiveZoom();
     return 0;
 }
 
 int RenderThemeMac::popupInternalPaddingBottom(RenderStyle* style) const
 {
-    if (style->appearance() == MenulistAppearance)
+    if (style->appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[bottomPadding] * style->effectiveZoom();
-    if (style->appearance() == MenulistButtonAppearance)
+    if (style->appearance() == MenulistButtonPart)
         return styledPopupPaddingBottom * style->effectiveZoom();
     return 0;
 }
 
 void RenderThemeMac::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
     float fontScale = style->fontSize() / baseFontSize;
 
     style->resetPadding();
     style->setBorderRadius(IntSize(int(baseBorderRadius + fontScale - 1), int(baseBorderRadius + fontScale - 1))); // FIXME: Round up?
@@ skipping 36 matching lines @@
 {
     style->setBoxShadow(0);
 }
 
 bool RenderThemeMac::paintSliderTrack(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     IntRect bounds = r;
     float zoomLevel = o->style()->effectiveZoom();
     float zoomedTrackWidth = trackWidth * zoomLevel;
 
-    if (o->style()->appearance() ==  SliderHorizontalAppearance || o->style()->appearance() ==  MediaSliderAppearance) {
+    if (o->style()->appearance() ==  SliderHorizontalPart || o->style()->appearance() ==  MediaSliderPart) {
         bounds.setHeight(zoomedTrackWidth);
         bounds.setY(r.y() + r.height() / 2 - zoomedTrackWidth / 2);
-    } else if (o->style()->appearance() == SliderVerticalAppearance) {
+    } else if (o->style()->appearance() == SliderVerticalPart) {
         bounds.setWidth(zoomedTrackWidth);
         bounds.setX(r.x() + r.width() / 2 - zoomedTrackWidth / 2);
     }
 
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     CGContextRef context = paintInfo.context->platformContext();
     RetainPtr<CGColorSpaceRef> cspace(AdoptCF, CGColorSpaceCreateDeviceRGB());
 
     paintInfo.context->save();
     CGContextClipToRect(context, bounds);
 
     struct CGFunctionCallbacks mainCallbacks = { 0, TrackGradientInterpolate, NULL };
     RetainPtr<CGFunctionRef> mainFunction(AdoptCF, CGFunctionCreate(NULL, 1, NULL, 4, NULL, &mainCallbacks));
     RetainPtr<CGShadingRef> mainShading;
-    if (o->style()->appearance() == SliderVerticalAppearance)
+    if (o->style()->appearance() == SliderVerticalPart)
         mainShading.adoptCF(CGShadingCreateAxial(cspace.get(), CGPointMake(bounds.x(),  bounds.bottom()), CGPointMake(bounds.right(), bounds.bottom()), mainFunction.get(), false, false));
     else
         mainShading.adoptCF(CGShadingCreateAxial(cspace.get(), CGPointMake(bounds.x(),  bounds.y()), CGPointMake(bounds.x(), bounds.bottom()), mainFunction.get(), false, false));
 
     IntSize radius(trackRadius, trackRadius);
     paintInfo.context->addRoundedRectClip(bounds,
         radius, radius,
         radius, radius);
     CGContextDrawShading(context, mainShading.get());
     paintInfo.context->restore();
     
     return false;
 }
 
 void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
     style->setBoxShadow(0);
 }
 
 const float verticalSliderHeightPadding = 0.1f;
 
 bool RenderThemeMac::paintSliderThumb(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     ASSERT(o->parent()->isSlider());
 
-    NSSliderCell* sliderThumbCell = o->style()->appearance() == SliderThumbVerticalAppearance
+    NSSliderCell* sliderThumbCell = o->style()->appearance() == SliderThumbVerticalPart
         ? sliderThumbVertical()
         : sliderThumbHorizontal();
 
     LocalCurrentGraphicsContext localContext(paintInfo.context);
 
     // Update the various states we respond to.
     updateEnabledState(sliderThumbCell, o->parent());
     updateFocusedState(sliderThumbCell, o->parent());
 
     // Update the pressed state using the NSCell tracking methods, since that's how NSSliderCell keeps track of it.
     bool oldPressed;
-    if (o->style()->appearance() == SliderThumbVerticalAppearance)
+    if (o->style()->appearance() == SliderThumbVerticalPart)
         oldPressed = m_isSliderThumbVerticalPressed;
     else
         oldPressed = m_isSliderThumbHorizontalPressed;
 
     bool pressed = static_cast<RenderSlider*>(o->parent())->inDragMode();
 
-    if (o->style()->appearance() == SliderThumbVerticalAppearance)
+    if (o->style()->appearance() == SliderThumbVerticalPart)
         m_isSliderThumbVerticalPressed = pressed;
     else
         m_isSliderThumbHorizontalPressed = pressed;
 
     if (pressed != oldPressed) {
         if (pressed)
             [sliderThumbCell startTrackingAt:NSPoint() inView:nil];
         else
             [sliderThumbCell stopTracking:NSPoint() at:NSPoint() inView:nil mouseIsUp:YES];
     }
 
     FloatRect bounds = r;
     // Make the height of the vertical slider slightly larger so NSSliderCell will draw a vertical slider.
-    if (o->style()->appearance() == SliderThumbVerticalAppearance)
+    if (o->style()->appearance() == SliderThumbVerticalPart)
         bounds.setHeight(bounds.height() + verticalSliderHeightPadding * o->style()->effectiveZoom());
 
     paintInfo.context->save();
     float zoomLevel = o->style()->effectiveZoom();
     
     FloatRect unzoomedRect = bounds;
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [sliderThumbCell drawWithFrame:FloatRectToNSRect(unzoomedRect) inView:view];
+    [sliderThumbCell drawWithFrame:FloatRectToNSRect(unzoomedRect) inView:nil];
     [sliderThumbCell setControlView:nil];
 
     paintInfo.context->restore();
 
     return false;
 }
 
 const int sliderThumbWidth = 15;
 const int sliderThumbHeight = 15;
 const int mediaSliderThumbWidth = 13;
 const int mediaSliderThumbHeight = 14;
 
 void RenderThemeMac::adjustSliderThumbSize(RenderObject* o) const
 {
     float zoomLevel = o->style()->effectiveZoom();
-    if (o->style()->appearance() == SliderThumbHorizontalAppearance || o->style()->appearance() == SliderThumbVerticalAppearance) {
+    if (o->style()->appearance() == SliderThumbHorizontalPart || o->style()->appearance() == SliderThumbVerticalPart) {
         o->style()->setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fixed));
         o->style()->setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
-    } else if (o->style()->appearance() == MediaSliderThumbAppearance) {
+    } else if (o->style()->appearance() == MediaSliderThumbPart) {
         o->style()->setWidth(Length(mediaSliderThumbWidth, Fixed));
         o->style()->setHeight(Length(mediaSliderThumbHeight, Fixed));
     }
 }
 
 bool RenderThemeMac::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     NSSearchFieldCell* search = this->search();
     LocalCurrentGraphicsContext localContext(paintInfo.context);
 
     setSearchCellState(o, r);
 
     paintInfo.context->save();
 
     float zoomLevel = o->style()->effectiveZoom();
 
     IntRect unzoomedRect = r;
     
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     // Set the search button to nil before drawing.  Then reset it so we can draw it later.
     [search setSearchButtonCell:nil];
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [search drawWithFrame:NSRect(IntRectToNSRect(unzoomedRect)) inView:view];
+    [search drawWithFrame:NSRect(IntRectToNSRect(unzoomedRect)) inView:nil];
 #ifdef BUILDING_ON_TIGER
     if ([search showsFirstResponder])
         wkDrawTextFieldCellFocusRing(search, NSRect(unzoomedRect));
 #endif
 
     [search setControlView:nil];
     [search resetSearchButtonCell];
 
     paintInfo.context->restore();
 
@@ skipping 75 matching lines @@
     
     IntRect unzoomedRect(NSRectToIntRect(bounds));
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [[search cancelButtonCell] drawWithFrame:IntRectToNSRect(unzoomedRect) inView:view];
+    [[search cancelButtonCell] drawWithFrame:IntRectToNSRect(unzoomedRect) inView:nil];
     [[search cancelButtonCell] setControlView:nil];
 
     paintInfo.context->restore();
     return false;
 }
 
 const IntSize* RenderThemeMac::cancelButtonSizes() const
 {
     static const IntSize sizes[3] = { IntSize(16, 13), IntSize(13, 11), IntSize(13, 9) };
     return sizes;
@@ skipping 39 matching lines @@
 {
     Node* input = o->node()->shadowAncestorNode();
     setSearchCellState(input->renderer(), r);
 
     NSSearchFieldCell* search = this->search();
 
     if ([search searchMenuTemplate] != nil)
         [search setSearchMenuTemplate:nil];
 
     NSRect bounds = [search searchButtonRectForBounds:NSRect(IntRectToNSRect(input->renderer()->absoluteBoundingBoxRect()))];
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [[search searchButtonCell] drawWithFrame:bounds inView:view];
+    [[search searchButtonCell] drawWithFrame:bounds inView:nil];
     [[search searchButtonCell] setControlView:nil];
     return false;
 }
 
 const int resultsArrowWidth = 5;
 void RenderThemeMac::adjustSearchFieldResultsButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
     style->setWidth(Length(size.width() + resultsArrowWidth, Fixed));
     style->setHeight(Length(size.height(), Fixed));
@@ skipping 18 matching lines @@
     
     IntRect unzoomedRect(NSRectToIntRect(bounds));
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
-#if 0
-    NSView* view = o->view()->frameView()->documentView();
-#endif
-    NSView* view = nil;
-    [[search searchButtonCell] drawWithFrame:IntRectToNSRect(unzoomedRect) inView:view];
+    [[search searchButtonCell] drawWithFrame:IntRectToNSRect(unzoomedRect) inView:nil];
     [[search searchButtonCell] setControlView:nil];
     
     paintInfo.context->restore();
 
     return false;
 }
 
 bool RenderThemeMac::paintMediaFullscreenButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     Node* node = o->element();
@@ skipping 35 matching lines @@
         return false;
 
     HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
     if (!mediaElement)
         return false;
 
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     if (mediaElement->canPlay())
         wkDrawMediaPlayButton(paintInfo.context->platformContext(), r, node->active());
     else
-        wkDrawMediaPauseButton(paintInfo.context->platformContext(), r, node->active());
+        wkDrawMediaPauseButton(paintInfo.context->platformContext(), r, node->active());        
 #endif
     return false;
 }
 
 bool RenderThemeMac::paintMediaSeekBackButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
     Node* node = o->element();
     if (!node)
         return false;
 
@@ skipping 39 matching lines @@
 {
     Node* node = o->element();
     if (!node)
         return false;
 
     LocalCurrentGraphicsContext localContext(paintInfo.context);
     wkDrawMediaSliderThumb(paintInfo.context->platformContext(), r, node->active());
     return false;
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 NSButtonCell* RenderThemeMac::checkbox() const
 {
     if (!m_checkbox) {
         m_checkbox.adoptNS([[NSButtonCell alloc] init]);
         [m_checkbox.get() setButtonType:NSSwitchButton];
         [m_checkbox.get() setTitle:nil];
         [m_checkbox.get() setAllowsMixedState:YES];
         [m_checkbox.get() setFocusRingType:NSFocusRingTypeExterior];
     }
     
     return m_checkbox.get();
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 NSButtonCell* RenderThemeMac::radio() const
 {
     if (!m_radio) {
         m_radio.adoptNS([[NSButtonCell alloc] init]);
         [m_radio.get() setButtonType:NSRadioButton];
         [m_radio.get() setTitle:nil];
         [m_radio.get() setFocusRingType:NSFocusRingTypeExterior];
     }
     
     return m_radio.get();
 }
 
+// TODO(port): This used to be in the upstream version until it was converted to the new theme API in r37731.
 NSButtonCell* RenderThemeMac::button() const
 {
     if (!m_button) {
         m_button.adoptNS([[NSButtonCell alloc] init]);
         [m_button.get() setTitle:nil];
         [m_button.get() setButtonType:NSMomentaryPushInButton];
     }
     
     return m_button.get();
 }
@@ skipping 50 matching lines @@
         [m_sliderThumbVertical.get() setTitle:nil];
         [m_sliderThumbVertical.get() setSliderType:NSLinearSlider];
         [m_sliderThumbVertical.get() setControlSize:NSSmallControlSize];
         [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];
     }
     
     return m_sliderThumbVertical.get();
 }
 
 } // namespace WebCore