Radio buttons are using the wrong sizes and margins

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

Reviewed by Jer Noble.

This is a regression that I caused recently when I combined radio button and
checkbox code.
* platform/mac/ThemeMac.mm:
(WebCore::paintToggleButton):



Canonical link: https://commits.webkit.org/149576@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: dethbakin

Source/WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2014-04-10  Beth Dakin  <bdakin@apple.com>
+
+        Radio buttons are using the wrong sizes and margins
+        https://bugs.webkit.org/show_bug.cgi?id=131503
+
+        Reviewed by Jer Noble.
+
+        This is a regression that I caused recently when I combined radio button and 
+        checkbox code. 
+        * platform/mac/ThemeMac.mm:
+        (WebCore::paintToggleButton):
+
 2014-04-08  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Assertion failure in WebCore::FlexBoxIterator::next()

Source/WebCore/platform/mac/ThemeMac.mm

@@ -394,10 +394,11 @@ static void paintToggleButton(ControlPart buttonType, ControlStates* controlStat
     GraphicsContextStateSaver stateSaver(*context);
 
     NSControlSize controlSize = [toggleButtonCell controlSize];
-    IntSize zoomedSize = checkboxSizes()[controlSize];
+    IntSize zoomedSize = buttonType == CheckboxPart ? checkboxSizes()[controlSize] : radioSizes()[controlSize];
     zoomedSize.setWidth(zoomedSize.width() * zoomFactor);
     zoomedSize.setHeight(zoomedSize.height() * zoomFactor);
-    IntRect inflatedRect = inflateRect(zoomedRect, zoomedSize, checkboxMargins(controlSize), zoomFactor);
+    const int* controlMargins = buttonType == CheckboxPart ? checkboxMargins(controlSize) : radioMargins(controlSize);
+    IntRect inflatedRect = inflateRect(zoomedRect, zoomedSize, controlMargins, zoomFactor);
 
     if (zoomFactor != 1.0f) {
         inflatedRect.setWidth(inflatedRect.width() / zoomFactor);