Merging upstream version 126.0.

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

1 files changed, 9 insertions, 3 deletions

diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
index 0cab187410..13219ff54b 100644
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -53,8 +53,6 @@ class LookAndFeel {
     CaretBlinkCount,
     // pixel width of caret
     CaretWidth,
-    // show the caret when text is selected?
-    ShowCaretDuringSelection,
     // select textfields when focused via tab/accesskey?
     SelectTextfieldsOnKeyFocus,
     // delay before submenus open
@@ -119,6 +117,9 @@ class LookAndFeel {
      */
     MacRTL,
 
+    /* Native macOS titlebar height. */
+    MacTitlebarHeight,
+
     /*
      * AlertNotificationOrigin indicates from which corner of the
      * screen alerts slide in, and from which direction (horizontal/vertical).
@@ -186,6 +187,7 @@ class LookAndFeel {
      */
     ContextMenuOffsetVertical,
     ContextMenuOffsetHorizontal,
+    TooltipOffsetVertical,
 
     /*
      * A boolean value indicating whether client-side decorations are
@@ -299,7 +301,6 @@ class LookAndFeel {
      * 1: High
      */
     DynamicRange,
-    VideoDynamicRange,
 
     /** Whether XUL panel animations are enabled. */
     PanelAnimations,
@@ -321,6 +322,11 @@ class LookAndFeel {
     return GetInt(IntID::UseOverlayScrollbars);
   }
 
+  static constexpr int32_t kDefaultTooltipOffset = 21;
+  static int32_t TooltipOffsetVertical() {
+    return GetInt(IntID::TooltipOffsetVertical, kDefaultTooltipOffset);
+  }
+
   // Returns keyCode value of a modifier key which is used for accesskey.
   // Returns 0 if the platform doesn't support access key.
   static uint32_t GetMenuAccessKey();