anim: make SVGOMAnimatedRect.getUnderlyingValue() less prone to races

css4j · Aug 6, 2024 · 6a886ef · 6a886ef
1 parent 77573ea
commit 6a886ef
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMAnimatedRect.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMAnimatedRect.java
@@ -126,8 +126,13 @@ protected void updateAnimatedValue(AnimatableValue val) {
 	 */
 	@Override
 	public AnimatableValue getUnderlyingValue(AnimationTarget target) {
-		SVGRect r = getBaseVal();
-		return new AnimatableRectValue(target, r.getX(), r.getY(), r.getWidth(), r.getHeight());
+		// Make sure that baseVal exists
+		getBaseVal();
+
+		// Calling SVGOMRect.toArray() revalidates only once and narrows the possibility
+		// of a race condition.
+		float[] rect = baseVal.toArray();
+		return new AnimatableRectValue(target, rect[0], rect[1], rect[2], rect[3]);
 	}
 
 	/**