Title: [243561] trunk
Revision
243561
Author
srobe...@apple.com
Date
2019-03-27 13:29:45 -0700 (Wed, 27 Mar 2019)

Log Message

Unreviewed, rolling out r243346.

Causing timeouts in animation tests across 10 builds

Reverted changeset:

"[Web Animations] JS wrapper may be deleted while animation is
yet to dispatch its finish event"
https://bugs.webkit.org/show_bug.cgi?id=196118
https://trac.webkit.org/changeset/243346

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (243560 => 243561)


--- trunk/LayoutTests/ChangeLog	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/LayoutTests/ChangeLog	2019-03-27 20:29:45 UTC (rev 243561)
@@ -1,3 +1,16 @@
+2019-03-27  Shawn Roberts  <srobe...@apple.com>
+
+        Unreviewed, rolling out r243346.
+
+        Causing timeouts in animation tests across 10 builds
+
+        Reverted changeset:
+
+        "[Web Animations] JS wrapper may be deleted while animation is
+        yet to dispatch its finish event"
+        https://bugs.webkit.org/show_bug.cgi?id=196118
+        https://trac.webkit.org/changeset/243346
+
 2019-03-27  Chris Dumez  <cdu...@apple.com>
 
         [ iOS Simulator ] REGRESSION (r237702) Layout Test http/tests/security/xss-DENIED-script-inject-into-inactive-window.html is a flaky failure

Deleted: trunk/LayoutTests/webanimations/js-wrapper-kept-alive-expected.txt (243560 => 243561)


--- trunk/LayoutTests/webanimations/js-wrapper-kept-alive-expected.txt	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/LayoutTests/webanimations/js-wrapper-kept-alive-expected.txt	2019-03-27 20:29:45 UTC (rev 243561)
@@ -1,10 +0,0 @@
-This test checks that registering an event listener on an animation whose JS wrapper would otherwise be garbage-collected still fires registered event listeners.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS event.target._isMyAnimation is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/webanimations/js-wrapper-kept-alive.html (243560 => 243561)


--- trunk/LayoutTests/webanimations/js-wrapper-kept-alive.html	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/LayoutTests/webanimations/js-wrapper-kept-alive.html	2019-03-27 20:29:45 UTC (rev 243561)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div id="target"></div>
-<script src=""
-<script>
-description("This test checks that registering an event listener on an animation whose JS wrapper would otherwise be garbage-collected still fires registered event listeners.");
-
-if (window.internals)
-    jsTestIsAsync = true;
-
-// A longer animation that could not be garbage-collected under any circumstance allows us to finish the test
-// with a reasonable delay without hard-coding a timeout.
-const timeoutAnimation = document.getElementById("target").animate({ marginRight: ["0px", "100px"] }, 1000);
-timeoutAnimation.addEventListener("finish", finishJSTest);
-
-function runTest() {
-    const animation = document.getElementById("target").animate({ marginLeft: ["0px", "100px"] }, 100);
-    animation._isMyAnimation = true;
-    animation.addEventListener("finish", event => {
-        shouldBeTrue("event.target._isMyAnimation");
-        finishJSTest();
-    });
-}
-
-gc();
-runTest();
-gc();
-
-</script>
-<script src=""
-</body>
-</html>
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (243560 => 243561)


--- trunk/Source/WebCore/ChangeLog	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/Source/WebCore/ChangeLog	2019-03-27 20:29:45 UTC (rev 243561)
@@ -1,3 +1,16 @@
+2019-03-27  Shawn Roberts  <srobe...@apple.com>
+
+        Unreviewed, rolling out r243346.
+
+        Causing timeouts in animation tests across 10 builds
+
+        Reverted changeset:
+
+        "[Web Animations] JS wrapper may be deleted while animation is
+        yet to dispatch its finish event"
+        https://bugs.webkit.org/show_bug.cgi?id=196118
+        https://trac.webkit.org/changeset/243346
+
 2019-03-27  Zalan Bujtas  <za...@apple.com>
 
         [ContentChangeObserver] Stop using the global _WKContentChange

Modified: trunk/Source/WebCore/animation/WebAnimation.cpp (243560 => 243561)


--- trunk/Source/WebCore/animation/WebAnimation.cpp	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/Source/WebCore/animation/WebAnimation.cpp	2019-03-27 20:29:45 UTC (rev 243561)
@@ -1159,16 +1159,10 @@
 
 void WebAnimation::stop()
 {
-    ActiveDOMObject::stop();
     m_isStopped = true;
     removeAllEventListeners();
 }
 
-bool WebAnimation::hasPendingActivity() const
-{
-    return m_timeline || m_isRelevant || ActiveDOMObject::hasPendingActivity();
-}
-
 void WebAnimation::updateRelevance()
 {
     m_isRelevant = computeRelevance();

Modified: trunk/Source/WebCore/animation/WebAnimation.h (243560 => 243561)


--- trunk/Source/WebCore/animation/WebAnimation.h	2019-03-27 20:29:29 UTC (rev 243560)
+++ trunk/Source/WebCore/animation/WebAnimation.h	2019-03-27 20:29:45 UTC (rev 243561)
@@ -117,8 +117,6 @@
     bool isSuspended() const { return m_isSuspended; }
     virtual void remove();
 
-    bool hasPendingActivity() const final;
-
     using RefCounted::ref;
     using RefCounted::deref;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to