Changeset 260705 in webkit

Timestamp:

Apr 25, 2020 9:08:46 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[Web Animations] KeyframeEffect should ensure its target remains alive
​https://bugs.webkit.org/show_bug.cgi?id=211019

Patch by Antoine Quint <Antoine Quint> on 2020-04-25
Reviewed by Daniel Bates.

Source/WebCore:

Test: webanimations/keyframe-effect-target-kept-alive.html

Make KeyframeEffect::m_target a RefPtr so that assigning an element to effect.target guarantees that element
is kept alive even if there are no other references to that element.

• animation/KeyframeEffect.cpp:

(WebCore::KeyframeEffect::KeyframeEffect):
(WebCore::KeyframeEffect::setTarget):

• animation/KeyframeEffect.h:

LayoutTests:

Add a test that creates a KeyframeEffect targeting an element with no other reference and trigger
garbage collection to check that the effect's target exists. This test would have failed prior to
this patch's code changes.

• webanimations/keyframe-effect-target-kept-alive-expected.txt: Added.
• webanimations/keyframe-effect-target-kept-alive.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/keyframe-effect-target-kept-alive-expected.txt (added)
• LayoutTests/webanimations/keyframe-effect-target-kept-alive.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (2 diffs)
• Source/WebCore/animation/KeyframeEffect.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-25  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] KeyframeEffect should ensure its target remains alive
+        https://bugs.webkit.org/show_bug.cgi?id=211019
+
+        Reviewed by Daniel Bates.
+
+        Add a test that creates a KeyframeEffect targeting an element with no other reference and trigger
+        garbage collection to check that the effect's target exists. This test would have failed prior to
+        this patch's code changes.
+
+        * webanimations/keyframe-effect-target-kept-alive-expected.txt: Added.
+        * webanimations/keyframe-effect-target-kept-alive.html: Added.
+
 2020-04-25  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-25  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] KeyframeEffect should ensure its target remains alive
+        https://bugs.webkit.org/show_bug.cgi?id=211019
+
+        Reviewed by Daniel Bates.
+
+        Test: webanimations/keyframe-effect-target-kept-alive.html
+
+        Make KeyframeEffect::m_target a RefPtr so that assigning an element to effect.target guarantees that element
+        is kept alive even if there are no other references to that element.
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::KeyframeEffect):
+        (WebCore::KeyframeEffect::setTarget):
+        * animation/KeyframeEffect.h:
+
 2020-04-25  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -529 +529 @@
 
 KeyframeEffect::KeyframeEffect(Element* target, PseudoId pseudoId)
-    : m_target(makeWeakPtr(target))
+    : m_target(target)
     , m_pseudoId(pseudoId)
 {
@@ -1122 +1122 @@
 void KeyframeEffect::setTarget(RefPtr<Element>&& newTarget)
 {
-    if (m_target.get() == newTarget.get())
+    if (m_target == newTarget)
         return;
 
     auto* previousTargetElementOrPseudoElement = targetElementOrPseudoElement();
-    m_target = makeWeakPtr(newTarget.get());
+    m_target = WTFMove(newTarget);
     didChangeTargetElementOrPseudoElement(previousTargetElementOrPseudoElement);
 }

trunk/Source/WebCore/animation/KeyframeEffect.h

@@ -203 +203 @@
     Vector<ParsedKeyframe> m_parsedKeyframes;
     Vector<AcceleratedAction> m_pendingAcceleratedActions;
-    WeakPtr<Element> m_target;
+    RefPtr<Element> m_target;
     PseudoId m_pseudoId { PseudoId::None };
     std::unique_ptr<const RenderStyle> m_unanimatedStyle;