Changeset 269623 in webkit

Timestamp:

Nov 10, 2020 3:35:51 AM (21 months ago)

Author:

graouts@webkit.org

Message:

[Web Animations] KeyframeEffect.pseudoElement does not return a valid string when targeting ::marker or ::first-letter
​https://bugs.webkit.org/show_bug.cgi?id=218741
<rdar://problem/71229846>

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark two new PASS results showing that KeyframeEffect.pseudoElement shows the correct value
when targeting ::marker or ::first-letter.

• web-platform-tests/web-animations/interfaces/Animatable/animate-expected.txt:

Source/WebCore:

We used to use PseudoElement::pseudoElementNameForEvents() to go from PseudoId to a String, but PseudoElement
only knows about ::before and ::after and not about valid pseudo-elements. We remove that method and create an
equivalent in WebAnimationUtilities that knows about all public pseudo-elements.

• animation/DeclarativeAnimation.cpp:

(WebCore::DeclarativeAnimation::enqueueDOMEvent):

• animation/KeyframeEffect.cpp:

(WebCore::KeyframeEffect::pseudoElement const):

• animation/WebAnimationUtilities.cpp:

(WebCore::pseudoIdAsString):

• animation/WebAnimationUtilities.h:
• dom/PseudoElement.cpp:

(WebCore::PseudoElement::pseudoElementNameForEvents): Deleted.

• dom/PseudoElement.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/Animatable/animate-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/DeclarativeAnimation.cpp (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (1 diff)
• Source/WebCore/animation/WebAnimationUtilities.cpp (modified) (1 diff)
• Source/WebCore/animation/WebAnimationUtilities.h (modified) (1 diff)
• Source/WebCore/dom/PseudoElement.cpp (modified) (1 diff)
• Source/WebCore/dom/PseudoElement.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-11-10  Antoine Quint  <graouts@webkit.org>
+
+        [Web Animations] KeyframeEffect.pseudoElement does not return a valid string when targeting ::marker or ::first-letter
+        https://bugs.webkit.org/show_bug.cgi?id=218741
+        <rdar://problem/71229846>
+
+        Reviewed by Dean Jackson.
+
+        Mark two new PASS results showing that KeyframeEffect.pseudoElement shows the correct value
+        when targeting ::marker or ::first-letter.
+
+        * web-platform-tests/web-animations/interfaces/Animatable/animate-expected.txt:
+
 2020-11-09  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/Animatable/animate-expected.txt

@@ -144 +144 @@
 PASS animate() with pseudoElement an Animation object targeting the correct pseudo-element
 PASS animate() with pseudoElement without content creates an Animation object targeting the correct pseudo-element
-FAIL animate() with pseudoElement an Animation object targeting the correct pseudo-element for ::marker assert_equals: The returned Animation targets the correct selector expected "::marker" but got ""
-FAIL animate() with pseudoElement an Animation object targeting the correct pseudo-element for ::first-line assert_equals: The returned Animation targets the correct selector expected "::first-line" but got ""
+PASS animate() with pseudoElement an Animation object targeting the correct pseudo-element for ::marker
+PASS animate() with pseudoElement an Animation object targeting the correct pseudo-element for ::first-line
 PASS animate() with a non-null invalid pseudoElement '' throws a SyntaxError
 PASS animate() with a non-null invalid pseudoElement 'before' throws a SyntaxError

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-10  Antoine Quint  <graouts@webkit.org>
+
+        [Web Animations] KeyframeEffect.pseudoElement does not return a valid string when targeting ::marker or ::first-letter
+        https://bugs.webkit.org/show_bug.cgi?id=218741
+        <rdar://problem/71229846>
+
+        Reviewed by Dean Jackson.
+
+        We used to use PseudoElement::pseudoElementNameForEvents() to go from PseudoId to a String, but PseudoElement
+        only knows about ::before and ::after and not about valid pseudo-elements. We remove that method and create an
+        equivalent in WebAnimationUtilities that knows about all public pseudo-elements.
+
+        * animation/DeclarativeAnimation.cpp:
+        (WebCore::DeclarativeAnimation::enqueueDOMEvent):
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::pseudoElement const):
+        * animation/WebAnimationUtilities.cpp:
+        (WebCore::pseudoIdAsString):
+        * animation/WebAnimationUtilities.h:
+        * dom/PseudoElement.cpp:
+        (WebCore::PseudoElement::pseudoElementNameForEvents): Deleted.
+        * dom/PseudoElement.h:
+
 2020-11-10  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/animation/DeclarativeAnimation.cpp

@@ -351 +351 @@
 
     auto time = secondsToWebAnimationsAPITime(elapsedTime) / 1000;
-    const auto& pseudoId = PseudoElement::pseudoElementNameForEvents(m_owningPseudoId);
+    auto pseudoId = pseudoIdAsString(m_owningPseudoId);
     auto timelineTime = timeline() ? timeline()->currentTime() : WTF::nullopt;
     auto event = createEvent(eventType, time, pseudoId, timelineTime);

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -1178 +1178 @@
     // When the effect target is a pseudo-element, this specifies the pseudo-element selector (e.g. ::before).
     if (targetsPseudoElement())
-        return PseudoElement::pseudoElementNameForEvents(m_pseudoId);
+        return pseudoIdAsString(m_pseudoId);
     return { };
 }

trunk/Source/WebCore/animation/WebAnimationUtilities.cpp

@@ -179 +179 @@
 }
 
+String pseudoIdAsString(PseudoId pseudoId)
+{
+    static NeverDestroyed<const String> after(MAKE_STATIC_STRING_IMPL("::after"));
+    static NeverDestroyed<const String> before(MAKE_STATIC_STRING_IMPL("::before"));
+    static NeverDestroyed<const String> firstLetter(MAKE_STATIC_STRING_IMPL("::first-letter"));
+    static NeverDestroyed<const String> firstLine(MAKE_STATIC_STRING_IMPL("::first-line"));
+    static NeverDestroyed<const String> highlight(MAKE_STATIC_STRING_IMPL("::highlight"));
+    static NeverDestroyed<const String> marker(MAKE_STATIC_STRING_IMPL("::marker"));
+    static NeverDestroyed<const String> selection(MAKE_STATIC_STRING_IMPL("::selection"));
+    static NeverDestroyed<const String> scrollbar(MAKE_STATIC_STRING_IMPL("::scrollbar"));
+    switch (pseudoId) {
+    case PseudoId::After:
+        return after;
+    case PseudoId::Before:
+        return before;
+    case PseudoId::FirstLetter:
+        return firstLetter;
+    case PseudoId::FirstLine:
+        return firstLine;
+    case PseudoId::Highlight:
+        return highlight;
+    case PseudoId::Marker:
+        return marker;
+    case PseudoId::Selection:
+        return selection;
+    case PseudoId::Scrollbar:
+        return scrollbar;
+    default:
+        return emptyString();
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/animation/WebAnimationUtilities.h

@@ -52 +52 @@
 
 bool compareAnimationsByCompositeOrder(const WebAnimation&, const WebAnimation&);
+String pseudoIdAsString(PseudoId);
 
 } // namespace WebCore

trunk/Source/WebCore/dom/PseudoElement.cpp

@@ -49 +49 @@
 }
 
-String PseudoElement::pseudoElementNameForEvents(PseudoId pseudoId)
-{
-    static NeverDestroyed<const String> after(MAKE_STATIC_STRING_IMPL("::after"));
-    static NeverDestroyed<const String> before(MAKE_STATIC_STRING_IMPL("::before"));
-    switch (pseudoId) {
-    case PseudoId::After:
-        return after;
-    case PseudoId::Before:
-        return before;
-    default:
-        return emptyString();
-    }
-}
-
 PseudoElement::PseudoElement(Element& host, PseudoId pseudoId)
     : Element(pseudoElementTagName(), host.document(), CreatePseudoElement)

trunk/Source/WebCore/dom/PseudoElement.h

@@ -47 +47 @@
     bool canContainRangeEndPoint() const override { return false; }
 
-    static String pseudoElementNameForEvents(PseudoId);
-
 private:
     PseudoElement(Element&, PseudoId);