[SVG] Handle animation freeze when 'repeatDur' is not a multiple of 'dur'

Ahmad-S792 · Ahmad Saleem · commit 72c7fe65cf68 · 2023-01-23T08:50:40.000-08:00
[SVG] Handle animation freeze when 'repeatDur' is not a multiple of 'dur' https://bugs.webkit.org/show_bug.cgi?id=250977 Reviewed by Simon Fraser. This patch is to align WebKit with Blink / Chromium and Gecko / Firefox. Merge - https://src.chromium.org/viewvc/blink?view=revision&revision=154777 This patch reinstate the logic which was present originally in WebKit but later remove, it is meant to handle the scenario 'repeatingDuration' is not a multiple of 'simpleDuration'. * Source/WebCore/svg/animation/SVGSMILElement.cpp: (SVGSMILElement::calculateAnimationPercentAndRepeat): Update to handle multiple of 'simpleDuration' * LayoutTests/imported/w3c/web-platform-tests/svg/animations/animate-fill-freeze-with-repeatDur-expected.txt: Rebaselined Canonical link: https://commits.webkit.org/259212@main
diff --git a/LayoutTests/imported/w3c/web-platform-tests/svg/animations/animate-fill-freeze-with-repeatDur-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/svg/animations/animate-fill-freeze-with-repeatDur-expected.txt
@@ -1,3 +1,3 @@
 
-FAIL Test for animation freeze when repeatDur is not a multiple of dur assert_approx_equals: expected 150 +/- 1 but got 50
+PASS Test for animation freeze when repeatDur is not a multiple of dur
 
diff --git a/Source/WebCore/svg/animation/SVGSMILElement.cpp b/Source/WebCore/svg/animation/SVGSMILElement.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2023 Apple Inc. All rights reserved.
- * Copyright (C) 2014 Google Inc. All rights reserved.
+ * Copyright (C) 2013-2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -1025,7 +1025,9 @@ float SVGSMILElement::calculateAnimationPercentAndRepeat(SMILTime elapsed, unsig
     SMILTime activeTime = elapsed - m_intervalBegin;
     SMILTime repeatingDuration = this->repeatingDuration();
     if (elapsed >= m_intervalEnd || activeTime > repeatingDuration) {
-        repeat = static_cast<unsigned>(repeatingDuration.value() / simpleDuration.value()) - 1;
+        repeat = static_cast<unsigned>(repeatingDuration.value() / simpleDuration.value());
+        if (!fmod(repeatingDuration.value(), simpleDuration.value()))
+            --repeat;
 
         double percent = (m_intervalEnd.value() - m_intervalBegin.value()) / simpleDuration.value();
         percent = percent - floor(percent);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`		`-FAIL Test for animation freeze when repeatDur is not a multiple of dur assert_approx_equals: expected 150 +/- 1 but got 50`
	`2`	`+PASS Test for animation freeze when repeatDur is not a multiple of dur`
`3`	`3`