Add back basic css version support and native controls os faking

Author: K4sum1

browser/base/content/test/forms/browser_selectpopup_large.js

@@ -249,7 +249,12 @@ async function performLargePopupTests(win) {
     // might return floating point values. We don't care about sub-pixel
     // accuracy, and only care about the final pixel value, so we add a
     // fuzz-factor of 1.
-    const fuzzFactor = 1;
+    //
+    // FIXME(emilio): In win7 scroll position is off by 20px more, but that's
+    // not reproducible in win10 even with the win7 "native" menus enabled.
+    const fuzzFactor = matchMedia("(-moz-platform: windows-win7)").matches
+      ? 21
+      : 1;
     SimpleTest.isfuzzy(
       selectPopup.children[selectedOption].getBoundingClientRect().bottom,
       selectPopup.getBoundingClientRect().bottom - bpBottom + marginBottom,

browser/base/content/test/static/browser_parsable_css.js

@@ -309,7 +309,12 @@ let customPropsDefinitionFileMap = new Map();
 function neverMatches(mediaList) {
   const perPlatformMediaQueryMap = {
     macosx: ["(-moz-platform: macos)"],
-    win: ["(-moz-platform: windows)"],
+    win: [
+      "(-moz-platform: windows)",
+      "(-moz-platform: windows-win7)",
+      "(-moz-platform: windows-win8)",
+      "(-moz-platform: windows-win10)",
+    ],
     linux: ["(-moz-platform: linux)"],
     android: ["(-moz-platform: android)"],
   };

layout/style/nsMediaFeatures.cpp

@@ -33,6 +33,10 @@
 #  include "mozilla/WindowsVersion.h"
 #endif
 
+// -- native controls patch includes --
+#include "mozilla/StaticPrefs_widget.h"
+// -- end native controls patch includes --
+
 using namespace mozilla;
 using mozilla::dom::DisplayMode;
 using mozilla::dom::Document;
@@ -252,10 +256,24 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
 #if defined(XP_WIN)
     case StylePlatform::Windows:
       return true;
-    case StylePlatform::WindowsWinXP: {
-      if (!IsVistaOrLater()) {
+    case StylePlatform::WindowsWin10:
+    case StylePlatform::WindowsWinXP: 
+    case StylePlatform::WindowsWin7:
+    case StylePlatform::WindowsWin8: {
+      int overridePref =
+          StaticPrefs::widget_ev_native_controls_patch_override_win_version();
+      bool doesOverride = overridePref > 0;
+
+      if ((!doesOverride && IsWin10OrLater()) || overridePref == 10) {
+        return aPlatform == StylePlatform::WindowsWin10;
+      }
+      if ((!doesOverride && IsWin8OrLater()) || overridePref == 8) {
+        return aPlatform == StylePlatform::WindowsWin8;
+      }
+      if ((!doesOverride && !IsVistaOrLater()) || overridePref == 5) {
         return aPlatform == StylePlatform::WindowsWinXP;
       }
+      return aPlatform == StylePlatform::WindowsWin7;
     }
 #elif defined(ANDROID)
     case StylePlatform::Android:

layout/style/test/chrome/chrome-only-media-queries.js

@@ -34,6 +34,9 @@ const CHROME_ONLY_QUERIES = [
   "(-moz-platform: windows)",
   "(-moz-platform: macos)",
   "(-moz-platform: android)",
+  "(-moz-platform: windows-win7)",
+  "(-moz-platform: windows-win8)",
+  "(-moz-platform: windows-win10)",
   "(-moz-content-prefers-color-scheme: dark)",
   "(-moz-content-prefers-color-scheme: light)",
   "(-moz-gtk-theme-family: unknown)",

modules/libpref/init/StaticPrefList.yaml

@@ -17510,6 +17510,11 @@
   value: false
   mirror: always
 
+- name: widget.ev-native-controls-patch.override-win-version
+  type: int32_t
+  value: 0
+  mirror: always
+  
 - name: widget.native-controls.force-dwm-report-off
   type: bool
   value: false

servo/components/style/gecko/media_features.rs

@@ -561,6 +561,12 @@ pub enum Platform {
     Windows,
     /// Matches only Windows XP.
     WindowsWinXP,
+    /// Matches only Windows 7.
+    WindowsWin7,
+    /// Matches only Windows 8.
+    WindowsWin8,
+    /// Matches windows 10 and actually matches windows 11 too, as of right now.
+    WindowsWin10,
 }
 
 fn eval_moz_platform(_: &Context, query_value: Option<Platform>) -> bool {

xpcom/ds/StaticAtoms.py

@@ -2262,8 +2262,11 @@
     Atom("forcemessagemanager", "forcemessagemanager"),
     Atom("initialBrowsingContextGroupId", "initialBrowsingContextGroupId"),
     Atom("manualactiveness", "manualactiveness"),
-    # Windows XP media query name because I'm too r3tard to do it properly
+    # windows media query names
     Atom("windows_winxp", "windows-winxp"),
+    Atom("windows_win7", "windows-win7"),
+    Atom("windows_win8", "windows-win8"),
+    Atom("windows_win10", "windows-win10"),
     # Names for system metrics.
     Atom("_moz_bool_pref", "-moz-bool-pref"),
     Atom("_moz_scrollbar_start_backward", "-moz-scrollbar-start-backward"),