From e916753d29956f8d712e81888ce52546718f2f19 Mon Sep 17 00:00:00 2001
From: Victor Allen <vwallen@antlab.net>
Date: Wed, 27 Nov 2024 11:28:40 -0800
Subject: [PATCH] Adds additional contain features and keys (#2252)

---
 features/contain-size.yml            |  1 -
 features/contain-size.yml.dist       |  1 -
 features/contain.yml                 | 10 ++++++++++
 features/contain.yml.dist            | 20 ++++++++++++++++++++
 features/content-visibility.yml      |  9 +++++++++
 features/content-visibility.yml.dist | 21 ++++++++++++++++++---
 6 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 features/contain.yml
 create mode 100644 features/contain.yml.dist

diff --git a/features/contain-size.yml b/features/contain-size.yml
index 28e93cd3e3d..84ca05e4364 100644
--- a/features/contain-size.yml
+++ b/features/contain-size.yml
@@ -3,5 +3,4 @@ description: "The `contain: size` CSS declaration sets an element's dimensions e
 spec: https://drafts.csswg.org/css-contain-2/#containment-size
 group: containment
 compat_features:
-  - css.properties.contain
   - css.properties.contain.size
diff --git a/features/contain-size.yml.dist b/features/contain-size.yml.dist
index 2dcb9b5d7b1..f961028a3df 100644
--- a/features/contain-size.yml.dist
+++ b/features/contain-size.yml.dist
@@ -14,5 +14,4 @@ status:
     safari: "15.4"
     safari_ios: "15.4"
 compat_features:
-  - css.properties.contain
   - css.properties.contain.size
diff --git a/features/contain.yml b/features/contain.yml
new file mode 100644
index 00000000000..4781a267540
--- /dev/null
+++ b/features/contain.yml
@@ -0,0 +1,10 @@
+name: contain
+description: "The `contain` CSS property sets limits to the scope of styles, layout, and paint rendering for speed and efficiency. The `none` keyword value disables containment, `strict` is equivalent to `contain: size layout style paint`, and `content` is equivalent to `contain: layout style paint`."
+spec: https://drafts.csswg.org/css-contain-2/#contain-property
+group: containment
+caniuse: css-containment
+compat_features:
+  - css.properties.contain
+  - css.properties.contain.content
+  - css.properties.contain.none
+  - css.properties.contain.strict
diff --git a/features/contain.yml.dist b/features/contain.yml.dist
new file mode 100644
index 00000000000..a4cafe93540
--- /dev/null
+++ b/features/contain.yml.dist
@@ -0,0 +1,20 @@
+# Generated from: contain.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2022-03-14
+  baseline_high_date: 2024-09-14
+  support:
+    chrome: "52"
+    chrome_android: "52"
+    edge: "79"
+    firefox: "69"
+    firefox_android: "79"
+    safari: "15.4"
+    safari_ios: "15.4"
+compat_features:
+  - css.properties.contain
+  - css.properties.contain.content
+  - css.properties.contain.none
+  - css.properties.contain.strict
diff --git a/features/content-visibility.yml b/features/content-visibility.yml
index 734f88fc7d7..df7bd09d71b 100644
--- a/features/content-visibility.yml
+++ b/features/content-visibility.yml
@@ -3,3 +3,12 @@ description: The `content-visibility` CSS property delays rendering an element,
 spec: https://drafts.csswg.org/css-contain-2/#content-visibility
 group: css
 caniuse: css-content-visibility
+compat_features:
+  - api.ContentVisibilityAutoStateChangeEvent
+  - api.ContentVisibilityAutoStateChangeEvent.ContentVisibilityAutoStateChangeEvent
+  - api.ContentVisibilityAutoStateChangeEvent.skipped
+  - api.Element.contentvisibilityautostatechange_event
+  - css.properties.content-visibility
+  - css.properties.content-visibility.auto
+  - css.properties.content-visibility.hidden
+  - css.properties.content-visibility.visible
diff --git a/features/content-visibility.yml.dist b/features/content-visibility.yml.dist
index 74b3bb01e41..a1de818c29e 100644
--- a/features/content-visibility.yml.dist
+++ b/features/content-visibility.yml.dist
@@ -8,8 +8,8 @@ status:
     chrome: "108"
     chrome_android: "108"
     edge: "108"
-    firefox: "125"
-    firefox_android: "125"
+    firefox: "130"
+    firefox_android: "130"
     safari: "18"
     safari_ios: "18"
 compat_features:
@@ -24,8 +24,10 @@ compat_features:
   #   safari: "18"
   #   safari_ios: "18"
   - css.properties.content-visibility
+  - css.properties.content-visibility.auto
+  - css.properties.content-visibility.hidden
+  - css.properties.content-visibility.visible
 
-  # ⬇️ Same status as overall feature ⬇️
   # baseline: low
   # baseline_low_date: 2024-09-16
   # support:
@@ -39,3 +41,16 @@ compat_features:
   - api.ContentVisibilityAutoStateChangeEvent
   - api.ContentVisibilityAutoStateChangeEvent.ContentVisibilityAutoStateChangeEvent
   - api.ContentVisibilityAutoStateChangeEvent.skipped
+
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: low
+  # baseline_low_date: 2024-09-16
+  # support:
+  #   chrome: "108"
+  #   chrome_android: "108"
+  #   edge: "108"
+  #   firefox: "130"
+  #   firefox_android: "130"
+  #   safari: "18"
+  #   safari_ios: "18"
+  - api.Element.contentvisibilityautostatechange_event