Changeset 287753 in webkit

Timestamp:

Jan 7, 2022, 9:32:52 AM (5 years ago)

Author:

Aditya Keerthi

Message:

Checkboxes on PurpleAir map controls are much smaller in Safari than other browsers
​https://bugs.webkit.org/show_bug.cgi?id=234897
rdar://83367191

Reviewed by Darin Adler.

Source/WebCore:

Unlike other browser engines, WebKit adjusts the size of checkboxes and
radio buttons based on the font-size of the element, when the size is
unspecified. The checkboxes on PurpleAir have a font-size of 9px, which
results in WebKit painting a checkbox using NSControlSizeMini (with a
length of 10px). In constrast, Chrome and Firefox simply use their
default sizes (13px and 12.6px respectively).

To fix, remove the font-size adjustments for checkboxes and radio
buttons with an unspecified size, and use the current effective
default of NSControlSizeSmall (with a length of 12px) to paint the
controls.

This ensures our unspecified sizing behavior matches other browsers.
There may be some risk for other WebKit clients that currently rely
on font-size getting them their desired size. However, this risk is
believed to be minimal given the sizes of these controls are already
restricted to a 10 - 16px range.

Test: fast/forms/checkbox-radio-font-size.html

• platform/mac/ThemeMac.mm:

(WebCore::checkboxSize):
(WebCore::radioSize):
(WebCore::ThemeMac::controlSize const):

LayoutTests:

• fast/forms/checkbox-radio-font-size-expected.html: Added.
• fast/forms/checkbox-radio-font-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/checkbox-radio-font-size-expected.html (added)
• LayoutTests/fast/forms/checkbox-radio-font-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/ThemeMac.mm (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-07  Aditya Keerthi  <akeerthi@apple.com>
+
+        Checkboxes on PurpleAir map controls are much smaller in Safari than other browsers
+        https://bugs.webkit.org/show_bug.cgi?id=234897
+        rdar://83367191
+
+        Reviewed by Darin Adler.
+
+        * fast/forms/checkbox-radio-font-size-expected.html: Added.
+        * fast/forms/checkbox-radio-font-size.html: Added.
+
 2022-01-07  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-07  Aditya Keerthi  <akeerthi@apple.com>
+
+        Checkboxes on PurpleAir map controls are much smaller in Safari than other browsers
+        https://bugs.webkit.org/show_bug.cgi?id=234897
+        rdar://83367191
+
+        Reviewed by Darin Adler.
+
+        Unlike other browser engines, WebKit adjusts the size of checkboxes and
+        radio buttons based on the font-size of the element, when the size is
+        unspecified. The checkboxes on PurpleAir have a font-size of 9px, which
+        results in WebKit painting a checkbox using NSControlSizeMini (with a
+        length of 10px). In constrast, Chrome and Firefox simply use their
+        default sizes (13px and 12.6px respectively).
+
+        To fix, remove the font-size adjustments for checkboxes and radio
+        buttons with an unspecified size, and use the current effective
+        default of NSControlSizeSmall (with a length of 12px) to paint the
+        controls.
+
+        This ensures our unspecified sizing behavior matches other browsers.
+        There may be some risk for other WebKit clients that currently rely
+        on font-size getting them their desired size. However, this risk is
+        believed to be minimal given the sizes of these controls are already
+        restricted to a 10 - 16px range.
+
+        Test: fast/forms/checkbox-radio-font-size.html
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::checkboxSize):
+        (WebCore::radioSize):
+        (WebCore::ThemeMac::controlSize const):
+
 2022-01-07  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -282 +282 @@
 }
 
-static LengthSize checkboxSize(const FontCascade& font, const LengthSize& zoomedSize, float zoomFactor)
+static LengthSize checkboxSize(const LengthSize& zoomedSize, float zoomFactor)
 {
     // If the width and height are both specified, then we have nothing to do.
@@ -288 +288 @@
         return zoomedSize;
 
-    // Use the font size to determine the intrinsic width of the control.
-    return sizeFromFont(font, zoomedSize, zoomFactor, checkboxSizes());
+    return sizeFromNSControlSize(NSControlSizeSmall, zoomedSize, zoomFactor, checkboxSizes());
 }
 
@@ -323 +322 @@
 }
 
-static LengthSize radioSize(const FontCascade& font, const LengthSize& zoomedSize, float zoomFactor)
+static LengthSize radioSize(const LengthSize& zoomedSize, float zoomFactor)
 {
     // If the width and height are both specified, then we have nothing to do.
@@ -329 +328 @@
         return zoomedSize;
 
-    // Use the font size to determine the intrinsic width of the control.
-    return sizeFromFont(font, zoomedSize, zoomFactor, radioSizes());
+    return sizeFromNSControlSize(NSControlSizeSmall, zoomedSize, zoomFactor, radioSizes());
 }
     
@@ -823 +821 @@
     switch (part) {
     case CheckboxPart:
-        return checkboxSize(font, zoomedSize, zoomFactor);
+        return checkboxSize(zoomedSize, zoomFactor);
     case RadioPart:
-        return radioSize(font, zoomedSize, zoomFactor);
+        return radioSize(zoomedSize, zoomFactor);
     case PushButtonPart:
         // Height is reset to auto so that specified heights can be ignored.