Backed out changeset 56aa4be0522c (bug 1710164) for causing bustages in nsLookAndFeel.mm

toolkit/themes/shared/in-content/common.inc.css

@@ -240,8 +240,8 @@
 @media (prefers-contrast) {
   :host,
   :root {
-    --in-content-page-color: WindowText;
-    --in-content-page-background: Window;
+    --in-content-page-color: -moz-DialogText;
+    --in-content-page-background: -moz-Dialog;
     --in-content-deemphasized-text: GrayText;
 
     --in-content-box-background: -moz-Dialog;
@@ -272,7 +272,6 @@
 
     --in-content-button-text-color-hover: HighlightText;
     --in-content-button-background: ButtonFace;
-    --in-content-button-text-color: ButtonText;
     --in-content-button-background-hover: Highlight;
     --in-content-button-background-active: Highlight;
 
@@ -398,7 +397,7 @@ html|input[type="color"],
 xul|menulist {
   appearance: none;
   min-height: 32px;
-  color: var(--in-content-button-text-color, inherit);
+  color: inherit;
   border: 1px solid transparent; /* shows up in high-contrast mode */
   border-radius: var(--in-content-button-border-radius);
   background-color: var(--in-content-button-background);
@@ -1031,7 +1030,6 @@ html|*#categories {
   border-radius: 4px;
   min-height: 48px;
   appearance: none;
-  color: inherit;
   margin-inline-start: 34px;
   padding-inline: 10px;
   transition: background-color 150ms;
@@ -1317,7 +1315,7 @@ xul|treecolpicker {
   appearance: none;
   border: none;
   background-color: var(--in-content-button-background);
-  color: var(--in-content-button-text-color, inherit);
+  color: inherit;
   padding: 5px 10px;
 }
 

widget/cocoa/nsLookAndFeel.mm

@@ -223,7 +223,7 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, nscolor
       break;
     case ColorID::Buttonface:
     case ColorID::MozButtonhoverface:
-      color = GetColorFromNSColor(NSColor.controlColor);
+      color = NS_RGB(0xF0, 0xF0, 0xF0);
       break;
     case ColorID::Buttonhighlight:
       color = NS_RGB(0xFF, 0xFF, 0xFF);
@@ -260,7 +260,7 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, nscolor
       color = NS_RGB(0xDA, 0xDA, 0xDA);
       break;
     case ColorID::Menu:
-      color = GetColorFromNSColor(NSColor.textBackgroundColor);
+      color = GetColorFromNSColor(NSColor.alternateSelectedControlTextColor);
       break;
     case ColorID::Windowframe:
       color = GetColorFromNSColor(NSColor.windowFrameColor);
@@ -277,7 +277,7 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, nscolor
       color = GetColorFromNSColor(NSColor.controlTextColor);
       break;
     case ColorID::MozDialog:
-      color = GetColorFromNSColor(NSColor.controlBackgroundColor);
+      color = GetColorFromNSColor(NSColor.controlHighlightColor);
       break;
     case ColorID::MozDialogtext:
     case ColorID::MozCellhighlighttext:
@@ -335,7 +335,8 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, nscolor
       color = GetColorFromNSColor(NSColor.controlAlternatingRowBackgroundColors[1]);
       break;
     case ColorID::MozNativehyperlinktext:
-      color = GetColorFromNSColor(NSColor.linkColor);
+      // There appears to be no available system defined color. HARDCODING to the appropriate color.
+      color = NS_RGB(0x14, 0x4F, 0xAE);
       break;
     // The following colors are supposed to be used as font-smoothing background
     // colors, in the chrome-only -moz-font-smoothing-background-color property.