[MQ5] Ensure that media “scripting: initial-only” never matches

https://bugs.webkit.org/show_bug.cgi?id=260432 Reviewed by Tim Nguyen. w3c/csswg-drafts#8621 * LayoutTests/fast/css/media-query-scripting-initial-only-expected.html: Added. * LayoutTests/fast/css/media-query-scripting-initial-only.html: Added. * Source/WebCore/css/query/MediaQueryFeatures.cpp: (WebCore::MQ::Features::scripting): Canonical link: https://commits.webkit.org/267198@main
WebKit · Aug 23, 2023 · 706e894 · 706e894
1 parent 508ac94
commit 706e894
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/LayoutTests/fast/css/media-query-scripting-initial-only-expected.html b/LayoutTests/fast/css/media-query-scripting-initial-only-expected.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<html style="color: green;"><p>This text should be green when printing.</p></html>
diff --git a/LayoutTests/fast/css/media-query-scripting-initial-only.html b/LayoutTests/fast/css/media-query-scripting-initial-only.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<style>
+    :root {
+        color: green;
+    }
+    @media (scripting: initial-only) {
+        :root {
+            color: red;
+        }
+    }
+</style>
+<p>This text should be green when printing.</p>
+<script>
+if (window.internals)
+    internals.settings.setMediaTypeOverride("print");
+</script>
+</html>
diff --git a/Source/WebCore/css/query/MediaQueryFeatures.cpp b/Source/WebCore/css/query/MediaQueryFeatures.cpp
@@ -607,11 +607,6 @@ const FeatureSchema& scripting()
 
             if (!frame.script().canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript))
                 return MatchingIdentifiers { CSSValueNone };
-
-            auto* frameView = frame.view();
-            if (frameView && frameView->mediaType() == printAtom())
-                return MatchingIdentifiers { CSSValueInitialOnly };
-
             return MatchingIdentifiers { CSSValueEnabled };
         }
     };