Remove containment and container query feature flags

https://bugs.webkit.org/show_bug.cgi?id=259771 rdar://113323967 Reviewed by Tim Nguyen. These have been enabled by default for a while now. * LayoutTests/fast/css/contain-invalidate-if-disabled-expected.txt: Removed. * LayoutTests/fast/css/contain-invalidate-if-disabled.html: Removed. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/css/CSSProperties.json: * Source/WebCore/css/parser/CSSParserContext.cpp: (WebCore::CSSParserContext::CSSParserContext): * Source/WebCore/css/parser/CSSParserImpl.cpp: (WebCore::CSSParserImpl::consumeContainerRule): * Tools/DumpRenderTree/TestOptions.cpp: (WTR::TestOptions::defaults): Canonical link: https://commits.webkit.org/276247@main
WebKit · Mar 17, 2024 · 6a88bee · 6a88bee
1 parent b2ec60c
commit 6a88bee
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 70 deletions.
diff --git a/LayoutTests/fast/css/contain-invalidate-if-disabled-expected.txt b/LayoutTests/fast/css/contain-invalidate-if-disabled-expected.txt
diff --git a/LayoutTests/fast/css/contain-invalidate-if-disabled.html b/LayoutTests/fast/css/contain-invalidate-if-disabled.html
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -959,34 +959,6 @@ CSSContainIntrinsicSizeEnabled:
     WebCore:
       default: true
 
-CSSContainerQueriesEnabled:
-  type: bool
-  status: stable
-  category: css
-  humanReadableName: "CSS Container Queries"
-  humanReadableDescription: "Enable CSS Container Queries"
-  defaultValue:
-    WebKitLegacy:
-      default: true
-    WebKit:
-      default: true
-    WebCore:
-      default: true
-
-CSSContainmentEnabled:
-  type: bool
-  status: stable
-  category: css
-  humanReadableName: "CSS Containment"
-  humanReadableDescription: "Enable contain CSS property"
-  defaultValue:
-    WebKitLegacy:
-      default: true
-    WebKit:
-      default: true
-    WebCore:
-      default: true
-
 CSSContentVisibilityEnabled:
   type: bool
   status: stable

diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json
@@ -6487,7 +6487,6 @@
             "codegen-properties": {
                 "converter": "Contain",
                 "initial": "initialContainment",
-                "settings-flag": "cssContainmentEnabled",
                 "parser-function": "consumeContain",
                 "parser-grammar-unused": "none | strict | content | [ size || layout || paint ]",
                 "parser-grammar-unused-reason": "Needs support for '||' groups.",
@@ -6512,7 +6511,6 @@
         },
         "container-name": {
             "codegen-properties": {
-                "settings-flag": "cssContainerQueriesEnabled",
                 "converter": "ContainerName",
                 "name-for-methods": "ContainerNames",
                 "parser-function": "consumeContainerName",
@@ -6531,7 +6529,6 @@
                 "inline-size"
             ],
             "codegen-properties": {
-                "settings-flag": "cssContainerQueriesEnabled",
                 "parser-grammar": "<<values>>"
             },
             "specification": {

diff --git a/Source/WebCore/css/parser/CSSParserContext.cpp b/Source/WebCore/css/parser/CSSParserContext.cpp
@@ -59,7 +59,6 @@ CSSParserContext::CSSParserContext(CSSParserMode mode, const URL& baseURL)
         focusVisibleEnabled = true;
         lightDarkEnabled = true;
         popoverAttributeEnabled = true;
-        propertySettings.cssContainmentEnabled = true;
         propertySettings.cssInputSecurityEnabled = true;
         propertySettings.cssCounterStyleAtRulesEnabled = true;
         propertySettings.viewTransitionsEnabled = true;

diff --git a/Source/WebCore/css/parser/CSSParserImpl.cpp b/Source/WebCore/css/parser/CSSParserImpl.cpp
@@ -1177,9 +1177,6 @@ RefPtr<StyleRuleLayer> CSSParserImpl::consumeLayerRule(CSSParserTokenRange prelu
 
 RefPtr<StyleRuleContainer> CSSParserImpl::consumeContainerRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
 {
-    if (!m_context.propertySettings.cssContainerQueriesEnabled)
-        return nullptr;
-
     if (prelude.atEnd())
         return nullptr;
 

diff --git a/Tools/DumpRenderTree/TestOptions.cpp b/Tools/DumpRenderTree/TestOptions.cpp
@@ -137,7 +137,6 @@ const TestFeatures& TestOptions::defaults()
             { "AsyncClipboardAPIEnabled", false },
             { "AttachmentElementEnabled", false },
             { "AttachmentWideLayoutEnabled", false },
-            { "CSSContainmentEnabled", false },
             { "CSSCounterStyleAtRuleImageSymbolsEnabled", false },
             { "CSSGradientInterpolationColorSpacesEnabled", true },
             { "CSSGradientPremultipliedAlphaInterpolationEnabled", true },