8332895: Support interpolation for backgrounds and borders

build.gradle

@@ -4375,6 +4375,7 @@ task javadoc(type: Javadoc, dependsOn: createMSPfile) {
     options.tags("apiNote:a:API Note:")
     options.tags("implSpec:a:Implementation Requirements:")
     options.tags("implNote:a:Implementation Note:")
+    options.tags("interpolationType:a:Interpolation Type:")
     options.tags("param")
     options.tags("return")
     options.tags("throws")

modules/javafx.base/src/main/java/com/sun/javafx/UnmodifiableArrayList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 package com.sun.javafx;
 
 import java.util.AbstractList;
+import java.util.List;
+import java.util.Objects;
 import java.util.RandomAccess;
 
 /**
@@ -60,4 +62,64 @@ public UnmodifiableArrayList(T[] elements, int size) {
     @Override public int size() {
         return size;
     }
+
+    /**
+     * Converts the specified list into an unmodifiable list that does not contain {@code null} values.
+     * The returned list is a copy of, and not a wrapper around the specified list.
+     *
+     * @param <T> the type of elements in the list
+     * @param list the list, not {@code null}
+     * @return an unmodifiable list that does not contain null values
+     */
+    public static <T> UnmodifiableArrayList<T> copyOfNullFiltered(List<T> list) {
+        Objects.requireNonNull(list, "list cannot be null");
+
+        int numNonNullValues = 0;
+
+        @SuppressWarnings("unchecked")
+        T[] newValues = (T[])new Object[list.size()];
+
+        if (list instanceof RandomAccess) {
+            // Prevents the iterator allocation for random-access lists.
+            for (int i = 0, max = list.size(); i < max; ++i) {
+                T value = list.get(i);
+                if (value != null) {
+                    newValues[numNonNullValues++] = value;
+                }
+            }
+        } else {
+            for (T value : list) {
+                if (value != null) {
+                    newValues[numNonNullValues++] = value;
+                }
+            }
+        }
+
+        return new UnmodifiableArrayList<>(newValues, numNonNullValues);
+    }
+
+    /**
+     * Converts the specified array into an unmodifiable list that does not contain {@code null} values.
+     * The returned list is a copy of, and not a wrapper around the specified array.
+     *
+     * @param <T> the type of elements in the array
+     * @param elements the array, not {@code null}
+     * @return an unmodifiable list that does not contain null values
+     */
+    public static <T> UnmodifiableArrayList<T> copyOfNullFiltered(T[] elements) {
+        Objects.requireNonNull(elements, "elements cannot be null");
+
+        int numNonNullValues = 0;
+
+        @SuppressWarnings("unchecked")
+        T[] newValues = (T[])new Object[elements.length];
+
+        for (int i = 0; i < elements.length; ++i) {
+            if (elements[i] != null) {
+                newValues[numNonNullValues++] = elements[i];
+            }
+        }
+
+        return new UnmodifiableArrayList<>(newValues, numNonNullValues);
+    }
 }

modules/javafx.base/src/test/addExports

@@ -1,4 +1,5 @@
 #
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.binding=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
 --add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED

modules/javafx.base/src/test/java/test/com/sun/javafx/UnmodifiableArrayListTest.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.com.sun.javafx;
+
+import com.sun.javafx.UnmodifiableArrayList;
+import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UnmodifiableArrayListTest {
+
+    @Test
+    void testCopyOfNullFilteredList_nullList() {
+        assertThrows(NullPointerException.class, () -> UnmodifiableArrayList.copyOfNullFiltered((List<?>)null));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_nullArray() {
+        assertThrows(NullPointerException.class, () -> UnmodifiableArrayList.copyOfNullFiltered((Object[])null));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_randomAccess() {
+        var list = new ArrayList<String>();
+        list.add("a");
+        list.add(null);
+        list.add("b");
+        list.add(null);
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+
+    @Test
+    void testCopyOfNullFilteredList_nonRandomAccess() {
+        var list = new LinkedList<String>();
+        list.add("a");
+        list.add(null);
+        list.add("b");
+        list.add(null);
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+
+    @Test
+    void testCopyOfNullFilteredArray() {
+        var list = new String[4];
+        list[0] = "a";
+        list[1] = null;
+        list[2] = "b";
+        list[3] = null;
+
+        assertEquals(List.of("a", "b"), UnmodifiableArrayList.copyOfNullFiltered(list));
+    }
+}

modules/javafx.base/src/test/java/test/util/ReflectionUtils.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.util;
+
+import java.lang.reflect.Field;
+import java.util.function.Function;
+
+public final class ReflectionUtils {
+
+    /**
+     * Returns the value of a potentially private field of the specified object.
+     * The field can be declared on any of the object's inherited classes.
+     */
+    public static Object getFieldValue(Object object, String fieldName) {
+        Function<Class<?>, Field> getField = cls -> {
+            try {
+                var field = cls.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return field;
+            } catch (NoSuchFieldException e) {
+                return null;
+            }
+        };
+
+        Class<?> cls = object.getClass();
+        while (cls != null) {
+            Field field = getField.apply(cls);
+            if (field != null) {
+                try {
+                    return field.get(object);
+                } catch (IllegalAccessException e) {
+                    throw new AssertionError(e);
+                }
+            }
+
+            cls = cls.getSuperclass();
+        }
+
+        throw new AssertionError("Field not found: " + fieldName);
+    }
+}

modules/javafx.graphics/.classpath

@@ -30,7 +30,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/base">
 		<attributes>
 			<attribute name="module" value="true"/>
-			<attribute name="add-exports" value="javafx.base/com.sun.javafx.property=javafx.graphics:javafx.base/test.javafx.collections=javafx.graphics:javafx.base/test.util.memory=javafx.graphics"/>
+			<attribute name="add-exports" value="javafx.base/com.sun.javafx.property=javafx.graphics:javafx.base/test.javafx.collections=javafx.graphics:javafx.base/test.util.memory=javafx.graphics:javafx.base/test.util=javafx.graphics"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">

modules/javafx.graphics/src/main/java/com/sun/javafx/css/SubPropertyConverter.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css;
+
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import java.util.Map;
+
+/**
+ * Defines the {@code convert} and {@code convertBack} operations that enable object
+ * decomposition and reconstruction. Note that the following invariant must always be
+ * satisfied: {@code convert(convertBack(value)).equals(value)}
+ *
+ * @param <T> the target type
+ */
+public interface SubPropertyConverter<T> {
+
+    /**
+     * Converts a map of CSS values to the target type.
+     *
+     * @param values the constituent values
+     * @throws NullPointerException if {@code values} is {@code null}
+     * @return the converted object
+     */
+    T convert(Map<CssMetaData<? extends Styleable, ?>, Object> values);
+
+    /**
+     * Converts an object back to a map of its constituent values (deconstruction).
+     * The returned map can be passed into {@link #convert(Map)} to reconstruct the object.
+     *
+     * @param value the object
+     * @throws NullPointerException if {@code value} is {@code null}
+     * @return a {@code Map} of the constituent values
+     */
+    Map<CssMetaData<? extends Styleable, ?>, Object> convertBack(T value);
+}

modules/javafx.graphics/src/main/java/com/sun/javafx/css/TransitionMediator.java

@@ -32,42 +32,33 @@
  */
 public abstract class TransitionMediator {
 
-    private TransitionTimer timer;
+    private TransitionTimer.CancellationToken cancellationToken;
 
     /**
      * Starts the transition timer with the specified transition definition.
      *
      * @param definition the transition definition
+     * @param targetPropertyName the name of the targeted CSS property
+     * @param nanoNow the current time in nanoseconds
      */
-    public final void run(TransitionDefinition definition) {
+    public final void run(TransitionDefinition definition, String targetPropertyName, long nanoNow) {
         // Might return 'null' if the transition duration is zero or the target node is not showing.
-        timer = TransitionTimer.run(this, definition);
+        cancellationToken = TransitionTimer.run(this, definition, targetPropertyName, nanoNow);
 
         // If no timer was started, we complete the transition immediately.
-        if (timer == null) {
+        if (cancellationToken == null) {
             onUpdate(1);
             onStop();
         }
     }
 
     /**
-     * Cancels the transition timer.
-     *
-     * @param forceStop if {@code true}, the transition timer is stopped unconditionally
-     * @return {@code true} if the timer was cancelled, {@code false} otherwise
-     * @see TransitionTimer#cancel(boolean)
-     */
-    public final boolean cancel(boolean forceStop) {
-        return timer == null || timer.cancel(forceStop);
-    }
-
-    /**
-     * Gets the running {@code TransitionTimer}.
-     *
-     * @return the {@code TransitionTimer}, or {@code null} if no timer is running
+     * Cancels the transition timer if it is currently running.
      */
-    public final TransitionTimer getTimer() {
-        return timer;
+    public final void cancel() {
+        if (cancellationToken != null) {
+            cancellationToken.cancel();
+        }
     }
 
     /**
@@ -90,4 +81,21 @@ public final TransitionTimer getTimer() {
      * Derived classes should implement this method to clear any references to this mediator.
      */
     public abstract void onStop();
+
+    /**
+     * Derived classes must implement the following protocol:
+     * <ol>
+     *     <li>If the reversing-adjusted start value of the existing transition is equal
+     *         to the end value of this transition:
+     *         Set the reversing-adjusted start value of this transition to the end value
+     *         of the existing transition and return {@code true}.
+     *     <li>Otherwise, return {@code false}.
+     * </ol>
+     * Refer to <a href="https://www.w3.org/TR/css-transitions-1/#starting">Starting of transitions</a>
+     * for more information about the reversing-adjusted start value.
+     *
+     * @param existingMediator the mediator of the existing transition
+     * @return {@code true} if the reversing-adjusted start value was updated, {@code false} otherwise
+     */
+    public abstract boolean updateReversingAdjustedStartValue(TransitionMediator existingMediator);
 }