Changeset 138632 in webkit

Timestamp:

Jan 2, 2013 12:31:44 PM (11 years ago)

Author:

esprehn@chromium.org

Message:

Transitions and animations do not apply to CSS ::before and ::after pseudo-elements
​https://bugs.webkit.org/show_bug.cgi?id=92591

Reviewed by Eric Seidel.

.:

Expose Element::pseudoElement for Internals.

• Source/autotools/symbols.filter:

Source/WebCore:

The new DOM based :before and :after pseudo elements support animations
and transitions already, but I had disabled support so we could turn them
on in a separate step. This patch just removes the checks and adds tests.

This also adds two methods to internals to allow pausing animations and
transitions on pseudo elements at predictable locations so the tests
are not flaky.

Tests: fast/css-generated-content/pseudo-animation.html

fast/css-generated-content/pseudo-transition.html

• WebCore.exp.in:
• page/animation/AnimationController.cpp:

(WebCore::AnimationController::updateAnimations):

• testing/Internals.cpp:

(WebCore::Internals::pauseAnimationAtTimeOnPseudoElement):
(WebCore::Internals::pauseTransitionAtTimeOnPseudoElement):

• testing/Internals.h:

(Internals):

• testing/Internals.idl:

LayoutTests:

Add tests that check if animations and transitions play for pseudo
:before and :after pseudo elements.

• fast/css-generated-content/pseudo-animation-expected.txt: Added.
• fast/css-generated-content/pseudo-animation.html: Added.
• fast/css-generated-content/pseudo-transition-expected.txt: Added.
• fast/css-generated-content/pseudo-transition.html: Added.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-generated-content/pseudo-animation-expected.txt (added)
• LayoutTests/fast/css-generated-content/pseudo-animation.html (added)
• LayoutTests/fast/css-generated-content/pseudo-transition-expected.txt (added)
• LayoutTests/fast/css-generated-content/pseudo-transition.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/autotools/symbols.filter (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2013-01-02  Elliott Sprehn  <esprehn@chromium.org>
+
+        Transitions and animations do not apply to CSS ::before and ::after pseudo-elements
+        https://bugs.webkit.org/show_bug.cgi?id=92591
+
+        Reviewed by Eric Seidel.
+
+        Expose Element::pseudoElement for Internals.
+
+        * Source/autotools/symbols.filter:
+
 2013-01-01  KwangYong Choi  <ky0.choi@samsung.com>
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-02  Elliott Sprehn  <esprehn@chromium.org>
+
+        Transitions and animations do not apply to CSS ::before and ::after pseudo-elements
+        https://bugs.webkit.org/show_bug.cgi?id=92591
+
+        Reviewed by Eric Seidel.
+
+        Add tests that check if animations and transitions play for pseudo
+        :before and :after pseudo elements.
+
+        * fast/css-generated-content/pseudo-animation-expected.txt: Added.
+        * fast/css-generated-content/pseudo-animation.html: Added.
+        * fast/css-generated-content/pseudo-transition-expected.txt: Added.
+        * fast/css-generated-content/pseudo-transition.html: Added.
+
 2013-01-02  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-02  Elliott Sprehn  <esprehn@chromium.org>
+
+        Transitions and animations do not apply to CSS ::before and ::after pseudo-elements
+        https://bugs.webkit.org/show_bug.cgi?id=92591
+
+        Reviewed by Eric Seidel.
+
+        The new DOM based :before and :after pseudo elements support animations
+        and transitions already, but I had disabled support so we could turn them
+        on in a separate step. This patch just removes the checks and adds tests.
+
+        This also adds two methods to internals to allow pausing animations and
+        transitions on pseudo elements at predictable locations so the tests
+        are not flaky.
+
+        Tests: fast/css-generated-content/pseudo-animation.html
+               fast/css-generated-content/pseudo-transition.html
+
+        * WebCore.exp.in:
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationController::updateAnimations):
+        * testing/Internals.cpp:
+        (WebCore::Internals::pauseAnimationAtTimeOnPseudoElement):
+        (WebCore::Internals::pauseTransitionAtTimeOnPseudoElement):
+        * testing/Internals.h:
+        (Internals):
+        * testing/Internals.idl:
+
 2013-01-02  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -893 +893 @@
 __ZN7WebCore7Element9innerTextEv
 __ZN7WebCore7Element9setPseudoERKN3WTF12AtomicStringE
+__ZNK7WebCore7Element13pseudoElementENS_8PseudoIdE
 __ZN7WebCore7IntRect5scaleEf
 __ZN7WebCore7IntRect5uniteERKS0_

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -511 +511 @@
         return newStyle;
 
-    // FIXME: We do not animate generated content yet.
-    if (renderer->isPseudoElement())
-        return newStyle;
-
     RenderStyle* oldStyle = renderer->style();
 
@@ -528 +524 @@
     // have changed, we reset the animation.  We then do a blend to get new values and we return
     // a new style.
-    ASSERT(renderer->node() && !renderer->isPseudoElement()); // FIXME: We do not animate generated content yet.
+
+    // We don't support anonymous pseudo elements like :first-line or :first-letter.
+    ASSERT(renderer->node());
 
     RefPtr<CompositeAnimation> rendererAnimations = m_data->accessCompositeAnimation(renderer);

trunk/Source/WebCore/testing/Internals.cpp

@@ -69 +69 @@
 #include "Page.h"
 #include "PrintContext.h"
+#include "PseudoElement.h"
 #include "Range.h"
 #include "RenderObject.h"
@@ -386 +387 @@
     ASSERT_NOT_REACHED();
     return false;
+}
+
+bool Internals::pauseAnimationAtTimeOnPseudoElement(const String& animationName, double pauseTime, Element* element, const String& pseudoId, ExceptionCode& ec)
+{
+    if (!element || pauseTime < 0) {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    if (pseudoId != "before" && pseudoId != "after") {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    PseudoElement* pseudoElement = element->pseudoElement(pseudoId == "before" ? BEFORE : AFTER);
+    if (!pseudoElement) {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    return frame()->animation()->pauseAnimationAtTime(pseudoElement->renderer(), animationName, pauseTime);
+}
+
+bool Internals::pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element* element, const String& pseudoId, ExceptionCode& ec)
+{
+    if (!element || pauseTime < 0) {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    if (pseudoId != "before" && pseudoId != "after") {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    PseudoElement* pseudoElement = element->pseudoElement(pseudoId == "before" ? BEFORE : AFTER);
+    if (!pseudoElement) {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    return frame()->animation()->pauseTransitionAtTime(pseudoElement->renderer(), property, pauseTime);
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -95 +95 @@
     void setShadowPseudoId(Element*, const String&, ExceptionCode&);
 
+    bool pauseAnimationAtTimeOnPseudoElement(const String& animationName, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
+    bool pauseTransitionAtTimeOnPseudoElement(const String& property, double pauseTime, Element*, const String& pseudoId, ExceptionCode&);
+
     PassRefPtr<Element> createContentElement(Document*, ExceptionCode&);
     bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -66 +66 @@
     boolean hasSelectorForPseudoClassInShadow(in Element host, in DOMString pseudoClass) raises (DOMException);
 
+    boolean pauseAnimationAtTimeOnPseudoElement(in DOMString animationName, in double pauseTime, in Element element, in DOMString pseudoId) raises (DOMException);
+    boolean pauseTransitionAtTimeOnPseudoElement(in DOMString property, in double pauseTime, in Element element, in DOMString pseudoId) raises (DOMException);
+
     Node nextSiblingByWalker(in Node node) raises(DOMException);
     Node firstChildByWalker(in Node node) raises(DOMException);

trunk/Source/autotools/symbols.filter

@@ -125 +125 @@
 _ZN7WebCore7Element20removeShadowRootListEv;
 _ZN7WebCore7Element9setPseudoERKN3WTF12AtomicStringE;
+_ZNK7WebCore7Element13pseudoElementENS_8PseudoIdE;
 _ZN7WebCore7jsArrayEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_13DOMStringListEEE;
 _ZN7WebCore7toRangeEN3JSC7JSValueE;
@@ -158 +159 @@
 _ZN7WebCore19AnimationController17suspendAnimationsEv;
 _ZN7WebCore19AnimationController16resumeAnimationsEv;
+_ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
+_ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd;
 _ZN7WebCore19InspectorController18setProfilerEnabledEb;
 _ZN7WebCore19InspectorController15profilerEnabledEv;