Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/toolkit/actors/SelectChild.sys.mjs b/toolkit/actors/SelectChild.sys.mjs
index a6d96d1b79..1bc80001ae 100644
--- a/toolkit/actors/SelectChild.sys.mjs
+++ b/toolkit/actors/SelectChild.sys.mjs
@@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 const kStateActive = 0x00000001; // ElementState::ACTIVE
 const kStateHover = 0x00000004; // ElementState::HOVER
 
-// Duplicated in SelectParent.jsm
+// Duplicated in SelectParent.sys.mjs
 // Please keep these lists in sync.
 const SUPPORTED_OPTION_OPTGROUP_PROPERTIES = [
   "direction",
@@ -277,7 +277,7 @@ SelectContentHelper.prototype = {
         InspectorUtils.removeContentState(this.element, kStateHover);
         break;
 
-      case "Forms:MouseUp":
+      case "Forms:MouseUp": {
         let win = this.element.ownerGlobal;
         if (message.data.onAnchor) {
           this.dispatchMouseEvent(win, this.element, "mouseup");
@@ -287,6 +287,7 @@ SelectContentHelper.prototype = {
           this.dispatchMouseEvent(win, this.element, "click");
         }
         break;
+      }
 
       case "Forms:SearchFocused":
         this._closeAfterBlur = false;
@@ -346,6 +347,13 @@ function getComputedStyles(element) {
 function supportedStyles(cs, supportedProps) {
   let styles = {};
   for (let property of supportedProps) {
+    if (property == "font-size") {
+      let usedSize = cs.usedFontSize;
+      if (usedSize >= 0.0) {
+        styles[property] = usedSize + "px";
+        continue;
+      }
+    }
     styles[property] = cs.getPropertyValue(property);
   }
   return styles;