Fix broken tooltips on 32 bit build

Reverts ade0599

Could be better, but I don't know how to properly fix the issue.

Author: K4sum1

layout/xul/nsMenuPopupFrame.cpp

@@ -2166,12 +2166,6 @@ nsMargin nsMenuPopupFrame::GetMargin() const {
     margin.left += auOffset.x;
     margin.right += auOffset.x;
   }
-  if (mPopupType == PopupType::Tooltip && !IsAnchored()) {
-    const auto auOffset =
-        CSSPixel::ToAppUnits(LookAndFeel::TooltipOffsetVertical());
-    margin.top += auOffset;
-    margin.bottom += auOffset;
-  }
   // TODO(emilio): We should consider make these properly mirrored (that is,
   // changing -= to += here, and removing the rtl special case), but some tests
   // rely on the old behavior of the anchor moving physically regardless of

toolkit/content/tests/chrome/window_tooltip.xhtml

@@ -30,8 +30,6 @@ var gOriginalWidth = -1;
 var gOriginalHeight = -1;
 var gButton = null;
 
-const kTooltipOffsetVertical = 10;
-
 function runTest()
 {
   startPopupTests(popupTests);
@@ -114,7 +112,7 @@ var popupTests = [
        Math.round(buttonrect.left + parseFloat(popupstyle.marginLeft) + 6),
        testname + " left position of tooltip");
     is(Math.round(rect.top),
-       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 6 + kTooltipOffsetVertical),
+       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 6),
        testname + " top position of tooltip");
 
     var labelrect = document.getElementById("label").getBoundingClientRect();
@@ -161,7 +159,7 @@ var popupTests = [
        Math.round(buttonrect.left + parseFloat(popupstyle.marginLeft) + 4),
        testname + " left position of tooltip");
     is(Math.round(rect.top),
-       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 4 + kTooltipOffsetVertical),
+       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 4),
        testname + " top position of tooltip");
 
     var labelrect = document.getElementById("label").getBoundingClientRect();
@@ -206,7 +204,7 @@ var popupTests = [
        Math.round(buttonrect.left + parseFloat(popupstyle.marginLeft) + 6),
        testname + " left position of tooltip");
     is(Math.round(rect.top),
-       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 6 + kTooltipOffsetVertical),
+       Math.round(buttonrect.top + parseFloat(popupstyle.marginTop) + 6),
        testname + " top position of tooltip");
 
     var labelrect = document.getElementById("label").getBoundingClientRect();
@@ -397,14 +395,7 @@ function moveWindowTo(x, y, callback, arg)
   }
 }
 
-(async function() {
-  let parent = window.arguments[0];
-  await Promise.all([
-    parent.SimpleTest.promiseFocus(window),
-    parent.SpecialPowers.pushPrefEnv({set: [["ui.tooltipOffsetVertical", kTooltipOffsetVertical]]}),
-  ]);
-  runTest();
-})();
+window.arguments[0].SimpleTest.waitForFocus(runTest, window);
 ]]>
 </script>
 

toolkit/content/xul.css

@@ -366,6 +366,10 @@ tooltip {
   pointer-events: none;
 }
 
+tooltip:not([position]) {
+  margin-top: 21px;
+}
+
 /**
  * It's important that these styles are in a UA sheet, because the default
  * tooltip is native anonymous content

widget/LookAndFeel.h

@@ -232,7 +232,6 @@ class LookAndFeel {
      */
     ContextMenuOffsetVertical,
     ContextMenuOffsetHorizontal,
-    TooltipOffsetVertical,
 
     /*
      * A boolean value indicating whether client-side decorations are
@@ -383,11 +382,6 @@ 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();

widget/nsXPLookAndFeel.cpp

@@ -174,7 +174,6 @@ static const char sIntPrefs[][45] = {
     "ui.scrollbarFadeDuration",
     "ui.contextMenuOffsetVertical",
     "ui.contextMenuOffsetHorizontal",
-    "ui.tooltipOffsetVertical",
     "ui.GtkCSDAvailable",
     "ui.GtkCSDTransparencyAvailable",
     "ui.GtkCSDMinimizeButton",

widget/windows/WinEventObserver.cpp

@@ -24,7 +24,6 @@
 #include "mozilla/Logging.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/WindowsVersion.h"
-#include "nsLookAndFeel.h"
 #include "nsStringFwd.h"
 #include "nsWindowDbg.h"
 #include "nsdefs.h"
@@ -177,11 +176,10 @@ static void OnSettingsChange(WPARAM wParam, LPARAM lParam) {
     case SPI_SETCLIENTAREAANIMATION:
     case SPI_SETKEYBOARDDELAY:
     case SPI_SETMOUSEVANISH:
-    case MOZ_SPI_SETCURSORSIZE:
       // These need to update LookAndFeel cached values.
       //
       // They affect reduced motion settings / caret blink count / show pointer
-      // while typing / tooltip offset, so no need to invalidate style / layout.
+      // while typing, so no need to invalidate style / layout.
       NotifyThemeChanged(widget::ThemeChangeKind::MediaQueriesOnly);
       return;
 

widget/windows/nsLookAndFeel.cpp

@@ -40,17 +40,6 @@ static int32_t GetSystemParam(long flag, int32_t def) {
   return ::SystemParametersInfo(flag, 0, &value, 0) ? value : def;
 }
 
-static int32_t GetTooltipOffsetVertical() {
-  static constexpr DWORD kDefaultCursorSize = 32;
-  const DWORD cursorSize =
-      GetSystemParam(MOZ_SPI_CURSORSIZE, kDefaultCursorSize);
-  if (cursorSize == kDefaultCursorSize) {
-    return LookAndFeel::kDefaultTooltipOffset;
-  }
-  return std::ceilf(float(LookAndFeel::kDefaultTooltipOffset) *
-                    float(cursorSize) / float(kDefaultCursorSize));
-}
-
 static bool SystemWantsDarkTheme() {
   if (nsUXThemeData::IsHighContrastOn()) {
     return LookAndFeel::IsDarkColor(
@@ -619,9 +608,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
     case IntID::ContextMenuOffsetHorizontal:
       aResult = 2;
       break;
-    case IntID::TooltipOffsetVertical:
-      aResult = GetTooltipOffsetVertical();
-      break;
     case IntID::SystemUsesDarkTheme:
       aResult = SystemWantsDarkTheme();
       break;

widget/windows/nsLookAndFeel.h

@@ -40,10 +40,6 @@
 #define SYS_COLOR_MAX 30
 #define SYS_COLOR_COUNT (SYS_COLOR_MAX - SYS_COLOR_MIN + 1)
 
-// Undocumented SPI, see bug 1712669 comment 4.
-#define MOZ_SPI_CURSORSIZE 0x2028
-#define MOZ_SPI_SETCURSORSIZE 0x2029
-
 namespace mozilla::widget::WinRegistry {
 class KeyWatcher;
 }

widget/windows/nsWindow.cpp

@@ -79,7 +79,6 @@
 
 #include "mozilla/widget/WinEventObserver.h"
 #include "mozilla/widget/WinMessages.h"
-#include "nsLookAndFeel.h"
 #include "nsWindow.h"
 #include "nsWindowTaskbarConcealer.h"
 #include "nsAppRunner.h"