Changeset 37790 in webkit

Timestamp:

Oct 22, 2008 2:51:23 PM (15 years ago)

Author:

hyatt@apple.com

Message:

2008-10-22 David Hyatt <​hyatt@apple.com>

​https://bugs.webkit.org/show_bug.cgi?id=21775

Convert buttons over to use the new Theme API on OS X.

Reviewed by Adam Roben

• platform/LengthBox.h: (WebCore::LengthBox::LengthBox):
• platform/Theme.cpp: (WebCore::Theme::controlBorder): (WebCore::Theme::controlPadding):
• platform/Theme.h: (WebCore::Theme::controlFont): (WebCore::Theme::controlSize): (WebCore::Theme::minControlSize): (WebCore::Theme::controlRequiresPreWhiteSpace):
• platform/mac/ThemeMac.h: (WebCore::ThemeMac::controlRequiresPreWhiteSpace):
• platform/mac/ThemeMac.mm: (WebCore::checkboxSize): (WebCore::radioSize): (WebCore::buttonSizes): (WebCore::buttonMargins): (WebCore::button): (WebCore::paintButton): (WebCore::ThemeMac::controlFont): (WebCore::ThemeMac::controlSize): (WebCore::ThemeMac::minControlSize): (WebCore::ThemeMac::controlBorder): (WebCore::ThemeMac::controlPadding): (WebCore::ThemeMac::inflateControlPaintRect): (WebCore::ThemeMac::paint):
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::adjustStyle): (WebCore::RenderTheme::paint): (WebCore::RenderTheme::controlStatesForRenderer): (WebCore::RenderTheme::isDefault): (WebCore::RenderTheme::adjustRadioStyle):
• rendering/RenderTheme.h: (WebCore::RenderTheme::setRadioSize):
• rendering/RenderThemeMac.h:
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::adjustRepaintRect): (WebCore::menuListButtonSizes): (WebCore::RenderThemeMac::adjustMenuListStyle):
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::paddingBox): (WebCore::InheritedFlags::setPaddingBox):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/LengthBox.h (modified) (1 diff)
• platform/Theme.cpp (modified) (3 diffs)
• platform/Theme.h (modified) (2 diffs)
• platform/mac/ThemeMac.h (modified) (1 diff)
• platform/mac/ThemeMac.mm (modified) (9 diffs)
• rendering/RenderTheme.cpp (modified) (11 diffs)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeMac.h (modified) (4 diffs)
• rendering/RenderThemeMac.mm (modified) (5 diffs)
• rendering/style/RenderStyle.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-22  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=21775
+
+        Convert buttons over to use the new Theme API on OS X.
+
+        Reviewed by Adam Roben
+
+        * platform/LengthBox.h:
+        (WebCore::LengthBox::LengthBox):
+        * platform/Theme.cpp:
+        (WebCore::Theme::controlBorder):
+        (WebCore::Theme::controlPadding):
+        * platform/Theme.h:
+        (WebCore::Theme::controlFont):
+        (WebCore::Theme::controlSize):
+        (WebCore::Theme::minControlSize):
+        (WebCore::Theme::controlRequiresPreWhiteSpace):
+        * platform/mac/ThemeMac.h:
+        (WebCore::ThemeMac::controlRequiresPreWhiteSpace):
+        * platform/mac/ThemeMac.mm:
+        (WebCore::checkboxSize):
+        (WebCore::radioSize):
+        (WebCore::buttonSizes):
+        (WebCore::buttonMargins):
+        (WebCore::button):
+        (WebCore::paintButton):
+        (WebCore::ThemeMac::controlFont):
+        (WebCore::ThemeMac::controlSize):
+        (WebCore::ThemeMac::minControlSize):
+        (WebCore::ThemeMac::controlBorder):
+        (WebCore::ThemeMac::controlPadding):
+        (WebCore::ThemeMac::inflateControlPaintRect):
+        (WebCore::ThemeMac::paint):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustStyle):
+        (WebCore::RenderTheme::paint):
+        (WebCore::RenderTheme::controlStatesForRenderer):
+        (WebCore::RenderTheme::isDefault):
+        (WebCore::RenderTheme::adjustRadioStyle):
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::setRadioSize):
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::adjustRepaintRect):
+        (WebCore::menuListButtonSizes):
+        (WebCore::RenderThemeMac::adjustMenuListStyle):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::paddingBox):
+        (WebCore::InheritedFlags::setPaddingBox):
+
 2008-10-22  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/platform/LengthBox.h

@@ -39 +39 @@
     }
 
+    LengthBox(int v)
+        : m_left(Length(v, Fixed))
+        , m_right(Length(v, Fixed))
+        , m_top(Length(v, Fixed))
+        , m_bottom(Length(v, Fixed))
+    {
+    }
+    
+    LengthBox(int t, int r, int b, int l)
+        : m_left(Length(l, Fixed))
+        , m_right(Length(r, Fixed))
+        , m_top(Length(t, Fixed))
+        , m_bottom(Length(b, Fixed))
+    {
+    }
+
     Length left() const { return m_left; }
     Length right() const { return m_right; }

trunk/WebCore/platform/Theme.cpp

@@ -29 +29 @@
 namespace WebCore {
 
-bool Theme::controlSupportsBorder(ControlPart part) const
+LengthBox Theme::controlBorder(ControlPart part, const Font&, const LengthBox& zoomedBox, float zoomFactor) const
 {
     switch (part) {
@@ -37 +37 @@
         case CheckboxPart:
         case RadioPart:
-            return false;
+            return LengthBox(0);
         default:
-            return true;
+            return zoomedBox;
     }
 }
 
-bool Theme::controlSupportsPadding(ControlPart part) const
+LengthBox Theme::controlPadding(ControlPart part, const Font&, const LengthBox& zoomedBox, float zoomFactor) const
 {
     switch (part) {
@@ -50 +50 @@
         case CheckboxPart:
         case RadioPart:
-            return false;
+            return LengthBox(0);
         default:
-            return true;
+            return zoomedBox;
     }
 }

trunk/WebCore/platform/Theme.h

@@ -30 +30 @@
 #include "Font.h"
 #include "IntRect.h"
+#include "LengthBox.h"
 #include "LengthSize.h"
 #include "PlatformString.h"
@@ -80 +81 @@
     // Methods used to adjust the RenderStyles of controls.
     
+    // The font description result should have a zoomed font size.
+    virtual FontDescription controlFont(ControlPart, const Font& font, float zoomFactor) const { return font.fontDescription(); }
+    
     // The size here is in zoomed coordinates already.  If a new size is returned, it also needs to be in zoomed coordinates.
     virtual LengthSize controlSize(ControlPart, const Font&, const LengthSize& zoomedSize, float zoomFactor) const { return zoomedSize; }
-    virtual bool controlSupportsBorder(ControlPart) const;
-    virtual bool controlSupportsPadding(ControlPart) const;
     
+    // Returns the minimum size for a control in zoomed coordinates.  
+    virtual LengthSize minimumControlSize(ControlPart, const Font&, float zoomFactor) const { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
+    
+    // Allows the theme to modify the existing padding/border.
+    virtual LengthBox controlPadding(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
+    virtual LengthBox controlBorder(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
+    
+    // Whether or not whitespace: pre should be forced on always.
+    virtual bool controlRequiresPreWhiteSpace(ControlPart) const { return false; }
+
     // Method for painting a control.  The rect is in zoomed coordinates.
     virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect& zoomedRect, float zoomFactor, ScrollView*) const { };

trunk/WebCore/platform/mac/ThemeMac.h

@@ -38 +38 @@
     virtual int baselinePositionAdjustment(ControlPart) const;
 
+    virtual FontDescription controlFont(ControlPart, const Font&, float zoomFactor) const;
+    
     virtual LengthSize controlSize(ControlPart, const Font&, const LengthSize&, float zoomFactor) const;
-    
+    virtual LengthSize minimumControlSize(ControlPart, const Font&, float zoomFactor) const;
+
+    virtual LengthBox controlPadding(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
+    virtual LengthBox controlBorder(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
+
+    virtual bool controlRequiresPreWhiteSpace(ControlPart part) const { return part == PushButtonPart; }
+
     virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect&, float zoomFactor, ScrollView*) const;
     virtual void inflateControlPaintRect(ControlPart, ControlStates, IntRect&, float zoomFactor) const;

trunk/WebCore/platform/mac/ThemeMac.mm

@@ -28 +28 @@
 
 #import "GraphicsContext.h"
+#import "LocalCurrentGraphicsContext.h"
 #import "ScrollView.h"
+#import "WebCoreSystemInterface.h"
 
 using namespace std;
+
+// FIXME: Default buttons really should be more like push buttons and not like buttons.
 
 namespace WebCore {
@@ -158 +162 @@
 }
 
-static LengthSize checkboxSize(ControlPart part, const Font& font, const LengthSize& zoomedSize, float zoomFactor)
+static LengthSize checkboxSize(const Font& font, const LengthSize& zoomedSize, float zoomFactor)
 {
     // If the width and height are both specified, then we have nothing to do.
@@ -235 +239 @@
 }
 
-static LengthSize radioSize(ControlPart part, const Font& font, const LengthSize& zoomedSize, float zoomFactor)
+static LengthSize radioSize(const Font& font, const LengthSize& zoomedSize, float zoomFactor)
 {
     // If the width and height are both specified, then we have nothing to do.
@@ -291 +295 @@
 }
 
+// Buttons
+
+// Buttons really only constrain height. They respect width.
+static const IntSize* buttonSizes()
+{
+    static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
+    return sizes;
+}
+
+static const int* buttonMargins(NSControlSize controlSize)
+{
+    static const int margins[3][4] =
+    {
+        { 4, 6, 7, 6 },
+        { 4, 5, 6, 5 },
+        { 0, 1, 1, 1 },
+    };
+    return margins[controlSize];
+}
+
+static NSButtonCell* button(ControlPart part, ControlStates states, const IntRect& zoomedRect, float zoomFactor)
+{
+    static NSButtonCell *buttonCell;
+    static bool defaultButton;
+    if (!buttonCell) {
+        buttonCell = [[NSButtonCell alloc] init];
+        [buttonCell setTitle:nil];
+        [buttonCell setButtonType:NSMomentaryPushInButton];
+    }
+
+    // Set the control size based off the rectangle we're painting into.
+    if (part == SquareButtonPart || zoomedRect.height() > buttonSizes()[NSRegularControlSize].height() * zoomFactor) {
+        // Use the square button
+        if ([buttonCell bezelStyle] != NSShadowlessSquareBezelStyle)
+            [buttonCell setBezelStyle:NSShadowlessSquareBezelStyle];
+    } else if ([buttonCell bezelStyle] != NSRoundedBezelStyle)
+        [buttonCell setBezelStyle:NSRoundedBezelStyle];
+
+    setControlSize(buttonCell, buttonSizes(), zoomedRect.size(), zoomFactor);
+
+    if (defaultButton != (states & DefaultState)) {
+        defaultButton = !defaultButton;
+        [buttonCell setKeyEquivalent:(defaultButton ? @"\r" : @"")];
+    }
+
+    // Update the various states we respond to.
+    updateStates(buttonCell, states);
+    
+    return buttonCell;
+}
+
+static void paintButton(ControlPart part, ControlStates states, GraphicsContext* context, const IntRect& zoomedRect, float zoomFactor, ScrollView* scrollView)
+{
+    // Determine the width and height needed for the control and prepare the cell for painting.
+    NSButtonCell *buttonCell = button(part, states, zoomedRect, zoomFactor);
+    LocalCurrentGraphicsContext localContext(context);
+
+    NSControlSize controlSize = [buttonCell controlSize];
+    IntSize zoomedSize = buttonSizes()[controlSize];
+    zoomedSize.setWidth(zoomedRect.width()); // Buttons don't ever constrain width, so the zoomed width can just be honored.
+    zoomedSize.setHeight(zoomedSize.height() * zoomFactor);
+    IntRect inflatedRect = zoomedRect;
+    if ([buttonCell bezelStyle] == NSRoundedBezelStyle) {
+        // Center the button within the available space.
+        if (inflatedRect.height() > zoomedSize.height()) {
+            inflatedRect.setY(inflatedRect.y() + (inflatedRect.height() - zoomedSize.height()) / 2);
+            inflatedRect.setHeight(zoomedSize.height());
+        }
+
+        // Now inflate it to account for the shadow.
+        inflatedRect = inflateRect(inflatedRect, zoomedSize, buttonMargins(controlSize), zoomFactor);
+
+        if (zoomFactor != 1.0f) {
+            inflatedRect.setWidth(inflatedRect.width() / zoomFactor);
+            inflatedRect.setHeight(inflatedRect.height() / zoomFactor);
+            context->translate(inflatedRect.x(), inflatedRect.y());
+            context->scale(FloatSize(zoomFactor, zoomFactor));
+            context->translate(-inflatedRect.x(), -inflatedRect.y());
+        }
+    } 
+
+    NSView *view = scrollView->documentView();
+    NSWindow *window = [view window];
+    NSButtonCell *previousDefaultButtonCell = [window defaultButtonCell];
+
+    if ((states & DefaultState) && [window isKeyWindow]) {
+        [window setDefaultButtonCell:buttonCell];
+        wkAdvanceDefaultButtonPulseAnimation(buttonCell);
+    } else if ([previousDefaultButtonCell isEqual:buttonCell])
+        [window setDefaultButtonCell:nil];
+
+    [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
+    [buttonCell setControlView:nil];
+
+    if (![previousDefaultButtonCell isEqual:buttonCell])
+        [window setDefaultButtonCell:previousDefaultButtonCell];
+}
+
 // Theme overrides
 
@@ -300 +402 @@
 }
 
+FontDescription ThemeMac::controlFont(ControlPart part, const Font& font, float zoomFactor) const
+{
+    switch (part) {
+        case PushButtonPart: {
+            FontDescription fontDescription;
+            fontDescription.setIsAbsoluteSize(true);
+            fontDescription.setGenericFamily(FontDescription::SerifFamily);
+
+            NSFont* nsFont = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSizeForFont(font)]];
+            fontDescription.firstFamily().setFamily([nsFont familyName]);
+            fontDescription.setComputedSize([nsFont pointSize] * zoomFactor);
+            fontDescription.setSpecifiedSize([nsFont pointSize] * zoomFactor);
+            return fontDescription;
+        }
+        default:
+            return Theme::controlFont(part, font, zoomFactor);
+    }
+}
+
 LengthSize ThemeMac::controlSize(ControlPart part, const Font& font, const LengthSize& zoomedSize, float zoomFactor) const
 {
     switch (part) {
         case CheckboxPart:
-            return checkboxSize(part, font, zoomedSize, zoomFactor);
+            return checkboxSize(font, zoomedSize, zoomFactor);
         case RadioPart:
-            return radioSize(part, font, zoomedSize, zoomFactor);
+            return radioSize(font, zoomedSize, zoomFactor);
+        case PushButtonPart:
+            // Height is reset to auto so that specified heights can be ignored.
+            return sizeFromFont(font, LengthSize(zoomedSize.width(), Length()), zoomFactor, buttonSizes());
         default:
             return zoomedSize;
+    }
+}
+
+LengthSize ThemeMac::minimumControlSize(ControlPart part, const Font& font, float zoomFactor) const
+{
+    switch (part) {
+        case SquareButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart:
+            return LengthSize(Length(0, Fixed), Length(static_cast<int>(15 * zoomFactor), Fixed));
+        default:
+            return Theme::minimumControlSize(part, font, zoomFactor);
+    }
+}
+
+LengthBox ThemeMac::controlBorder(ControlPart part, const Font& font, const LengthBox& zoomedBox, float zoomFactor) const
+{
+    switch (part) {
+        case SquareButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart:
+            return LengthBox(0, zoomedBox.right().value(), 0, zoomedBox.left().value());
+        default:
+            return Theme::controlBorder(part, font, zoomedBox, zoomFactor);
+    }
+}
+
+LengthBox ThemeMac::controlPadding(ControlPart part, const Font& font, const LengthBox& zoomedBox, float zoomFactor) const
+{
+    switch (part) {
+        case PushButtonPart: {
+            // 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 HTML <button> will match our rendering by default, since we're using a consistent
+            // padding.
+            const int padding = 8 * zoomFactor;
+            return LengthBox(0, padding, 0, padding);
+        }
+        default:
+            return Theme::controlPadding(part, font, zoomedBox, zoomFactor);
     }
 }
@@ -318 +483 @@
             // 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.
-            NSCell* cell = checkbox(states, zoomedRect, zoomFactor);
+            NSCell *cell = checkbox(states, zoomedRect, zoomFactor);
             NSControlSize controlSize = [cell controlSize];
             IntSize zoomedSize = checkboxSizes()[controlSize];
@@ -329 +494 @@
             // We inflate the rect as needed to account for padding included in the cell to accommodate the radio button
             // shadow".  We don't consider this part of the bounds of the control in WebKit.
-            NSCell* cell = radio(states, zoomedRect, zoomFactor);
+            NSCell *cell = radio(states, zoomedRect, zoomFactor);
             NSControlSize controlSize = [cell controlSize];
             IntSize zoomedSize = radioSizes()[controlSize];
@@ -337 +502 @@
             break;
         }
+        case PushButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart: {
+            NSButtonCell *cell = button(part, states, zoomedRect, zoomFactor);
+            NSControlSize controlSize = [cell controlSize];
+
+            // We inflate the rect as needed to account for the Aqua button's shadow.
+            if ([cell bezelStyle] == NSRoundedBezelStyle) {
+                IntSize zoomedSize = buttonSizes()[controlSize];
+                zoomedSize.setHeight(zoomedSize.height() * zoomFactor);
+                zoomedSize.setWidth(zoomedRect.width()); // Buttons don't ever constrain width, so the zoomed width can just be honored.
+                zoomedRect = inflateRect(zoomedRect, zoomedSize, buttonMargins(controlSize), zoomFactor);
+            }
+            break;
+        }
         default:
             break;
@@ -351 +531 @@
             paintRadio(states, context, zoomedRect, zoomFactor, scrollView);
             break;
-        default:
-            break;
-    }
-}
-
-}
+        case PushButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart:
+        case SquareButtonPart:
+            paintButton(part, states, context, zoomedRect, zoomFactor, scrollView);
+            break;
+        default:
+            break;
+    }
+}
+
+}

trunk/WebCore/rendering/RenderTheme.cpp

@@ -26 +26 @@
 #include "Document.h"
 #include "FocusController.h"
+#include "FontSelector.h"
 #include "Frame.h"
 #include "GraphicsContext.h"
@@ -63 +64 @@
 
     if (UAHasAppearance && theme()->isControlStyled(style, border, background, backgroundColor)) {
-        if (part == MenulistPart)
+        if (part == MenulistPart) {
             style->setAppearance(MenulistButtonPart);
-        else
+            part = MenulistButtonPart;
+        } else
             style->setAppearance(NoControlPart);
     }
@@ -76 +78 @@
     
 #if USE(NEW_THEME)
-    if (part == CheckboxPart || part == RadioPart) {
-        if (!m_theme->controlSupportsBorder(part))
-            style->resetBorder();
-        if (!m_theme->controlSupportsPadding(part))
-            style->resetPadding();
+    switch (part) {
+        case CheckboxPart:
+        case RadioPart:
+        case PushButtonPart:
+        case SquareButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart: {
+            // Border
+            LengthBox borderBox(style->borderTopWidth(), style->borderRightWidth(), style->borderBottomWidth(), style->borderLeftWidth());
+            borderBox = m_theme->controlBorder(part, style->font(), borderBox, style->effectiveZoom());
+            if (borderBox.top().value() != style->borderTopWidth()) {
+                if (borderBox.top().value())
+                    style->setBorderTopWidth(borderBox.top().value());
+                else
+                    style->resetBorderTop();
+            }
+            if (borderBox.right().value() != style->borderRightWidth()) {
+                if (borderBox.right().value())
+                    style->setBorderRightWidth(borderBox.right().value());
+                else
+                    style->resetBorderRight();
+            }
+            if (borderBox.bottom().value() != style->borderBottomWidth()) {
+                style->setBorderBottomWidth(borderBox.bottom().value());
+                if (borderBox.bottom().value())
+                    style->setBorderBottomWidth(borderBox.bottom().value());
+                else
+                    style->resetBorderBottom();
+            }
+            if (borderBox.left().value() != style->borderLeftWidth()) {
+                style->setBorderLeftWidth(borderBox.left().value());
+                if (borderBox.left().value())
+                    style->setBorderLeftWidth(borderBox.left().value());
+                else
+                    style->resetBorderLeft();
+            }
+
+            // Padding
+            LengthBox paddingBox = m_theme->controlPadding(part, style->font(), style->paddingBox(), style->effectiveZoom());
+            if (paddingBox != style->paddingBox())
+                style->setPaddingBox(paddingBox);
+
+            // Whitespace
+            if (m_theme->controlRequiresPreWhiteSpace(part))
+                style->setWhiteSpace(PRE);
             
-        // 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_theme->controlSize(part, style->font(), 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());
+            // 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_theme->controlSize(part, style->font(), 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_theme->minimumControlSize(part, style->font(), style->effectiveZoom());
+            if (minControlSize.width() != style->minWidth())
+                style->setMinWidth(minControlSize.width());
+            if (minControlSize.height() != style->minHeight())
+                style->setMinHeight(minControlSize.height());
+                
+            // Font
+            FontDescription controlFont = m_theme->controlFont(part, style->font(), style->effectiveZoom());
+            if (controlFont != style->font().fontDescription()) {
+                // Reset our line-height
+                style->setLineHeight(RenderStyle::initialLineHeight());
+                
+                // Now update our font.
+                if (style->setFontDescription(controlFont))
+                    style->font().update(0);
+            }
+        }
+        default:
+            break;
     }
 #endif
@@ -99 +163 @@
         case RadioPart:
             return adjustRadioStyle(selector, style, e);
-#endif
         case PushButtonPart:
         case SquareButtonPart:
@@ -105 +168 @@
         case ButtonPart:
             return adjustButtonStyle(selector, style, e);
+#endif
         case TextFieldPart:
             return adjustTextFieldStyle(selector, style, e);
@@ -157 +221 @@
 
 #if USE(NEW_THEME)
-    if (part == CheckboxPart || part == RadioPart) {
-        m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
-        return false;
+    switch (part) {
+        case CheckboxPart:
+        case RadioPart:
+        case PushButtonPart:
+        case SquareButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart:
+            m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
+            return false;
+        default:
+            break;
     }
 #endif
@@ -170 +242 @@
         case RadioPart:
             return paintRadio(o, paintInfo, r);
-#endif
         case PushButtonPart:
         case SquareButtonPart:
@@ -176 +247 @@
         case ButtonPart:
             return paintButton(o, paintInfo, r);
+#endif
         case MenulistPart:
             return paintMenuList(o, paintInfo, r);
@@ -523 +595 @@
         return false;
     
-    if (!o->style())
-        return false;
-    
     return o->style()->appearance() == DefaultButtonPart;
 }
@@ -563 +632 @@
     style->setBoxShadow(0);
 }
-#endif
 
 void RenderTheme::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
@@ -571 +639 @@
     setButtonSize(style);
 }
+#endif
 
 void RenderTheme::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const

trunk/WebCore/rendering/RenderTheme.h

@@ -149 +149 @@
     virtual bool paintRadio(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return true; }
     virtual void setRadioSize(RenderStyle*) const { }
-#endif
 
     virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return true; }
     virtual void setButtonSize(RenderStyle*) const { }
+#endif
 
     virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const;

trunk/WebCore/rendering/RenderThemeMac.h

@@ -77 +77 @@
 
 protected:
-    // Methods for each appearance value.
-    virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, WebCore::Element*) const;
-    virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-    virtual void setButtonSize(RenderStyle*) const;
-
     virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
     virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
@@ -142 +137 @@
     // Helpers for adjusting appearance and for painting
 
-    void setButtonPaddingFromControlSize(RenderStyle*, NSControlSize) const;
-    const IntSize* buttonSizes() const;
-    const int* buttonMargins() const;
-    void setButtonCellState(const RenderObject*, const IntRect&);
-
     void setPopupButtonCellState(const RenderObject*, const IntRect&);
     const IntSize* popupButtonSizes() const;
@@ -160 +150 @@
     void setSearchFieldSize(RenderStyle*) const;
     
-    NSButtonCell* button() const;
     NSPopUpButtonCell* popupButton() const;
     NSSearchFieldCell* search() const;
@@ -168 +157 @@
 
 private:
-    mutable RetainPtr<NSButtonCell> m_button;
     mutable RetainPtr<NSPopUpButtonCell> m_popupButton;
     mutable RetainPtr<NSSearchFieldCell> m_search;

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -425 +425 @@
     
 #if USE(NEW_THEME)
-    if (part == CheckboxPart || part == RadioPart)
-        return RenderTheme::adjustRepaintRect(o, r);
+    switch (part) {
+        case CheckboxPart:
+        case RadioPart:
+        case PushButtonPart:
+        case SquareButtonPart:
+        case DefaultButtonPart:
+        case ButtonPart:
+            return RenderTheme::adjustRepaintRect(o, r);
+        default:
+            break;
+    }
 #endif
 
     float zoomLevel = o->style()->effectiveZoom();
 
-    switch (o->style()->appearance()) {
-        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 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;
+    if (part == MenulistPart) {
+        setPopupButtonCellState(o, r);
+        IntSize size = popupButtonSizes()[[popupButton() controlSize]];
+        size.setHeight(size.height() * zoomLevel);
+        size.setWidth(r.width());
+        r = inflateRect(r, size, popupButtonMargins(), zoomLevel);
     }
 }
@@ -618 +606 @@
 }
 
-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));
-}
-
-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() == 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.
-        setButtonSize(style);
-
-        // Add in the padding that we'd like to use.
-        setButtonPaddingFromControlSize(style, controlSize);
-
-        // 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);
-    } else {
-        // Set a min-height so that we can't get smaller than the mini button.
-        style->setMinHeight(Length(static_cast<int>(15 * style->effectiveZoom()), Fixed));
-
-        // Reset the top and bottom borders.
-        style->resetBorderTop();
-        style->resetBorderBottom();
-    }
-
-    style->setBoxShadow(0);
-}
-
-const IntSize* RenderThemeMac::buttonSizes() const
-{
-    static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
-    return sizes;
-}
-
-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]];
-}
-
-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());
-}
-
-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() == 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());
-
-    NSWindow *window = [o->view()->frameView()->documentView() window];
-    BOOL isDefaultButton = (isDefault(o) && [window isKeyWindow]);
-    [button setKeyEquivalent:(isDefaultButton ? @"\r" : @"")];
-
-    // Update the various states we respond to.
-    updateCheckedState(button, o);
-    updateEnabledState(button, o);
-    updatePressedState(button, o);
-    updateFocusedState(button, o);
-}
-
-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();
-
-    // We inflate the rect as needed to account for padding included in the cell to accommodate the button
-    // shadow.  We don't consider this part of the bounds of the control in WebKit.
-    float zoomLevel = o->style()->effectiveZoom();
-    IntSize size = buttonSizes()[[button controlSize]];
-    size.setWidth(r.width());
-    size.setHeight(size.height() * zoomLevel);
-    IntRect inflatedRect = r;
-    if ([button bezelStyle] == NSRoundedBezelStyle) {
-        // Center the button within the available space.
-        if (inflatedRect.height() > size.height()) {
-            inflatedRect.setY(inflatedRect.y() + (inflatedRect.height() - size.height()) / 2);
-            inflatedRect.setHeight(size.height());
-        }
-
-        // Now inflate it to account for the shadow.
-        inflatedRect = inflateRect(inflatedRect, size, buttonMargins(), 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());
-        }
-    } 
-
-    NSView *view = o->view()->frameView()->documentView();
-    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];
-
-    [button drawWithFrame:NSRect(inflatedRect) inView:view];
-    [button setControlView:nil];
-
-    if (![previousDefaultButtonCell isEqual:button])
-        [window setDefaultButtonCell:previousDefaultButtonCell];
-
-    paintInfo.context->restore();
-
-    return false;
-}
-
 bool RenderThemeMac::paintTextField(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r)
 {
@@ -1066 +884 @@
 }
 
+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
 {
@@ -1084 +908 @@
 
     // 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
@@ -1631 +1455 @@
 }
 
-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();
-}
-
 NSPopUpButtonCell* RenderThemeMac::popupButton() const
 {

trunk/WebCore/rendering/style/RenderStyle.h

@@ -544 +544 @@
     Length marginRight() const { return surround->margin.right(); }
 
+    LengthBox paddingBox() const { return surround->padding; }
     Length paddingTop() const { return surround->padding.top(); }
     Length paddingBottom() const { return surround->padding.bottom(); }
@@ -828 +829 @@
 
     void resetPadding() { SET_VAR(surround, padding, LengthBox(Auto)) }
+    void setPaddingBox(const LengthBox& b) { SET_VAR(surround, padding, b) }
     void setPaddingTop(Length v) { SET_VAR(surround, padding.m_top, v) }
     void setPaddingBottom(Length v) { SET_VAR(surround, padding.m_bottom, v) }