Unreviewed, reverting 271040@main and 271042@main.

https://bugs.webkit.org/show_bug.cgi?id=265283 Introduced flaky ASSERTs in WebInspector Reverted changesets: "[view-transitions] Implement parsing & checking for pseudo-elements" https://bugs.webkit.org/show_bug.cgi?id=265167 https://commits.webkit.org/271040@main "Include CSSSelectorParserContext.h instead of CSSSelectorParser.h" https://bugs.webkit.org/show_bug.cgi?id=265234 https://commits.webkit.org/271042@main Canonical link: https://commits.webkit.org/271077@main
WebKit · Nov 23, 2023 · c2f3cd7 · c2f3cd7
1 parent 6ca73eb
commit c2f3cd7
Show file tree

Hide file tree

Showing 29 changed files with 41 additions and 728 deletions.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml.html
@@ -12,26 +12,20 @@
     // we need the empty stylesheet to avoid default XSLT views of the XML
     const style = iframe.contentDocument.createElementNS("http://www.w3.org/1999/xhtml", "style");
     root.appendChild(style);
-
-    // Grab initial styles from a random element, as the root can get non-initial UA styling.
-    const div = iframe.contentDocument.createElementNS("http://www.w3.org/1999/xhtml", "div");
-    root.appendChild(div);
-    const cs = iframe.contentWindow.getComputedStyle(div);
-
+    const cs = iframe.contentWindow.getComputedStyle(root);
     let actual_initial = Object.create(null);
     for (let i = 0; i < cs.length; i++) {
         let prop_name = cs[i];
         actual_initial[prop_name] = cs[prop_name];
     }
-    const rootCS = iframe.contentWindow.getComputedStyle(root);
     test(() => {
         style.textContent = ":root { color: blue }";
-        assert_equals(rootCS["color"], "rgb(0, 0, 255)");
+        assert_equals(cs["color"], "rgb(0, 0, 255)");
     }, "stylesheet takes effect");
     style.textContent = ":root { all: initial; direction: initial; unicode-bidi: initial; } style { display: none; }";
     for (let prop_name in actual_initial) {
         test(() => {
-            assert_equals(rootCS[prop_name], actual_initial[prop_name]);
+            assert_equals(cs[prop_name], actual_initial[prop_name]);
         }, prop_name);
     }
 });

diff --git a/.../web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-invalid-expected.txt b/.../web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-invalid-expected.txt
diff --git a/...rted/w3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-invalid.html b/...rted/w3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-invalid.html
diff --git a/...3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-valid-expected.txt b/...3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-valid-expected.txt
diff --git a/...ported/w3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-valid.html b/...ported/w3c/web-platform-tests/css/css-view-transitions/parsing/pseudo-elements-valid.html
diff --git a/...latform-tests/css/css-view-transitions/parsing/view-transition-name-computed-expected.txt b/...latform-tests/css/css-view-transitions/parsing/view-transition-name-computed-expected.txt
@@ -3,9 +3,4 @@ PASS Property view-transition-name value 'none'
 PASS Property view-transition-name value 'foo'
 PASS Property view-transition-name value 'bar'
 PASS Property view-transition-name value 'baz'
-PASS Property view-transition-name value 'unset'
-PASS Property view-transition-name value 'initial'
-PASS Property view-transition-name value 'inherit'
-PASS Property view-transition-name value 'revert'
-PASS Property view-transition-name value 'revert-layer'
 
diff --git a/...3c/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-computed.html b/...3c/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-computed.html
@@ -12,16 +12,13 @@
 </head>
 <body>
 <div id=target></div>
+<div id=scratch></div>
 <script>
+
 test_computed_value("view-transition-name", "none");
 test_computed_value("view-transition-name", "foo");
 test_computed_value("view-transition-name", "bar");
 test_computed_value("view-transition-name", "baz");
-test_computed_value("view-transition-name", "unset", "none");
-test_computed_value("view-transition-name", "initial", "none");
-test_computed_value("view-transition-name", "inherit", "none");
-test_computed_value("view-transition-name", "revert", "none");
-test_computed_value("view-transition-name", "revert-layer", "none");
 </script>
 </body>
 </html>
diff --git a/...platform-tests/css/css-view-transitions/parsing/view-transition-name-invalid-expected.txt b/...platform-tests/css/css-view-transitions/parsing/view-transition-name-invalid-expected.txt
@@ -1,5 +1,4 @@
 
-PASS e.style['view-transition-name'] = "default" should not set the property value
 PASS e.style['view-transition-name'] = "none none" should not set the property value
 PASS e.style['view-transition-name'] = "\"none\"" should not set the property value
 PASS e.style['view-transition-name'] = "\"foo\"" should not set the property value

diff --git a/...w3c/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-invalid.html b/...w3c/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-invalid.html
@@ -12,7 +12,6 @@
 </head>
 <body>
 <script>
-test_invalid_value("view-transition-name", "default"); // `default` isn't allowed by the `<custom-ident>` syntax.
 test_invalid_value("view-transition-name", "none none");
 test_invalid_value("view-transition-name", `"none"`);
 test_invalid_value("view-transition-name", `"foo"`);

diff --git a/Source/WebCore/animation/WebAnimationUtilities.cpp b/Source/WebCore/animation/WebAnimationUtilities.cpp
@@ -32,10 +32,8 @@
 #include "AnimationPlaybackEvent.h"
 #include "CSSAnimation.h"
 #include "CSSAnimationEvent.h"
-#include "CSSParserContext.h"
 #include "CSSPropertyNames.h"
 #include "CSSSelector.h"
-#include "CSSSelectorParser.h"
 #include "CSSTransition.h"
 #include "CSSTransitionEvent.h"
 #include "DeclarativeAnimation.h"
@@ -329,10 +327,7 @@ ExceptionOr<PseudoId> pseudoIdFromString(const String& pseudoElement)
     auto isLegacy = pseudoElement == ":before"_s || pseudoElement == ":after"_s || pseudoElement == ":first-letter"_s || pseudoElement == ":first-line"_s;
     if (!isLegacy && !pseudoElement.startsWith("::"_s))
         return Exception { ExceptionCode::SyntaxError };
-
-    // FIXME: This parserContext should include a document to get the proper settings.
-    CSSSelectorParserContext parserContext { CSSParserContext { HTMLStandardMode } };
-    auto pseudoType = CSSSelector::parsePseudoElementType(StringView(pseudoElement).substring(isLegacy ? 1 : 2), parserContext);
+    auto pseudoType = CSSSelector::parsePseudoElementType(StringView(pseudoElement).substring(isLegacy ? 1 : 2));
     if (pseudoType == CSSSelector::PseudoElementUnknown || pseudoType == CSSSelector::PseudoElementWebKitCustom)
         return Exception { ExceptionCode::SyntaxError };
     return CSSSelector::pseudoId(pseudoType);

diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -29,7 +29,6 @@
 #include "CSSPropertyAnimation.h"
 #include "CSSPropertyParser.h"
 #include "CSSSelector.h"
-#include "CSSSelectorParserContext.h"
 #include "CSSValuePool.h"
 #include "ComposedTreeAncestorIterator.h"
 #include "ComputedStyleExtractor.h"
@@ -56,7 +55,7 @@ CSSComputedStyleDeclaration::CSSComputedStyleDeclaration(Element& element, bool
         name = name.substring(1);
     if (name.startsWith(':'))
         name = name.substring(1);
-    m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoElementType(name, CSSSelectorParserContext { element.document() }));
+    m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoElementType(name));
 }
 
 CSSComputedStyleDeclaration::~CSSComputedStyleDeclaration() = default;