src/java.desktop/share/classes/java/awt/MediaTracker.java

@@ -23,14 +23,15 @@
  * questions.
  */
 
 package java.awt;
 
-import java.awt.Component;
-import java.awt.Image;
 import java.awt.image.ImageObserver;
+import java.awt.image.ResolutionVariantItem;
 import sun.awt.image.MultiResolutionToolkitImage;
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * The {@code MediaTracker} class is a utility class to track
  * the status of a number of media objects. Media objects could
  * include audio clips as well as images, though currently only

@@ -222,16 +223,28 @@
      * @param     w    the width at which the image is rendered
      * @param     h    the height at which the image is rendered
      */
     public synchronized void addImage(Image image, int id, int w, int h) {
         addImageImpl(image, id, w, h);
-        Image rvImage = getResolutionVariant(image);
-        if (rvImage != null) {
-            addImageImpl(rvImage, id,
-                    w == -1 ? -1 : 2 * w,
-                    h == -1 ? -1 : 2 * h);
+
+        if (image instanceof MultiResolutionToolkitImage) {
+            getRVItems(image).forEach(rvItem ->
+                    addImageImpl(rvItem.getValue(), id,
+                                 scale(w, rvItem.getScaleX()),
+                                 scale(h, rvItem.getScaleY())
+                    ));
+        }
+    }
+
+
+    private static Stream<ResolutionVariantItem<Image>> getRVItems(Image image) {
+        return ((MultiResolutionToolkitImage) image)
+                .getResolutionVariantItems().stream();
         }
+
+    private static int scale(int size, double scale) {
+        return size == -1 ? -1 : (int) Math.floor(scale * size);
     }
 
     private void addImageImpl(Image image, int id, int w, int h) {
         head = MediaEntry.insert(head,
                                  new ImageMediaEntry(this, image, id, w, h));

@@ -730,14 +743,15 @@
      * @see     java.awt.MediaTracker#removeImage(java.awt.Image, int, int, int)
      * @since   1.1
      */
     public synchronized void removeImage(Image image) {
         removeImageImpl(image);
-        Image rvImage = getResolutionVariant(image);
-        if (rvImage != null) {
-            removeImageImpl(rvImage);
+        if (image instanceof MultiResolutionToolkitImage) {
+            getRVItems(image).forEach(rvItem ->
+                    removeImageImpl(rvItem.getValue()));
         }
+
         notifyAll();    // Notify in case remaining images are "done".
     }
 
     private void removeImageImpl(Image image) {
         MediaEntry cur = head;

@@ -769,13 +783,14 @@
      * @see        java.awt.MediaTracker#removeImage(java.awt.Image, int, int, int)
      * @since      1.1
      */
     public synchronized void removeImage(Image image, int id) {
         removeImageImpl(image, id);
-        Image rvImage = getResolutionVariant(image);
-        if (rvImage != null) {
-            removeImageImpl(rvImage, id);
+
+        if (image instanceof MultiResolutionToolkitImage) {
+            getRVItems(image).forEach(rvItem ->
+                    removeImageImpl(rvItem.getValue(), id));
         }
         notifyAll();    // Notify in case remaining images are "done".
     }
 
     private void removeImageImpl(Image image, int id) {

@@ -810,15 +825,18 @@
      * @since   1.1
      */
     public synchronized void removeImage(Image image, int id,
                                          int width, int height) {
         removeImageImpl(image, id, width, height);
-        Image rvImage = getResolutionVariant(image);
-        if (rvImage != null) {
-            removeImageImpl(rvImage, id,
-                    width == -1 ? -1 : 2 * width,
-                    height == -1 ? -1 : 2 * height);
+
+        if (image instanceof MultiResolutionToolkitImage) {
+
+            getRVItems(image).forEach(rvItem ->
+                    removeImageImpl(rvItem.getValue(), id,
+                                    scale(width, rvItem.getScaleX()),
+                                    scale(height, rvItem.getScaleY())
+                    ));
         }
         notifyAll();    // Notify in case remaining images are "done".
     }
 
     private void removeImageImpl(Image image, int id, int width, int height) {

@@ -843,17 +861,10 @@
     }
 
     synchronized void setDone() {
         notifyAll();
     }
-
-    private static Image getResolutionVariant(Image image) {
-        if (image instanceof MultiResolutionToolkitImage) {
-            return ((MultiResolutionToolkitImage) image).getResolutionVariant();
-        }
-        return null;
-    }
 }
 
 abstract class MediaEntry {
     MediaTracker tracker;
     int ID;