From e76186a6e9a4c8d5d9ad44d5e61786440dc6e21d Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 19 Mar 2019 17:35:45 +0000
Subject: [PATCH] Bug 1532471 part 2: Enable CSS containment for early beta and
 earlier. r=emilio

Depends on D23362

Differential Revision: https://phabricator.services.mozilla.com/D23363

--HG--
extra : moz-landing-system : lando
---
 .../shared/css/generated/properties-db.js     | 19 +++++++++++++++++++
 modules/libpref/init/StaticPrefList.h         |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 2b27a07a0c02..a5ea0cf1efd4 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -5678,6 +5678,25 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "contain": {
+    "isInherited": false,
+    "subproperties": [
+      "contain"
+    ],
+    "supports": [],
+    "values": [
+      "content",
+      "inherit",
+      "initial",
+      "layout",
+      "none",
+      "paint",
+      "revert",
+      "size",
+      "strict",
+      "unset"
+    ]
+  },
   "content": {
     "isInherited": false,
     "subproperties": [
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index 7ae0461b515b..02da4fac5d84 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1012,11 +1012,17 @@ VARCACHE_PREF(
 )
 
 // Is support for CSS contain enabled?
+#ifdef EARLY_BETA_OR_EARLIER
+#define PREF_VALUE true
+#else
+#define PREF_VALUE false
+#endif
 VARCACHE_PREF(
   "layout.css.contain.enabled",
    layout_css_contain_enabled,
-  bool, false
+  bool, PREF_VALUE
 )
+#undef PREF_VALUE
 
 // Is steps(jump-*) supported in easing functions?
 VARCACHE_PREF(