From 12723688ca49d379d43fd0fd0e55a28afe299687 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 27 Nov 2023 09:01:22 +0000
Subject: [PATCH] 8318113: CSS.BackgroundImage doesn't implement equals

Reviewed-by: aivanov, tr, prr
---
 .../share/classes/javax/swing/text/html/CSS.java      | 11 +++++++++++
 .../swing/text/html/CSS/CSSAttributeEqualityBug.java  |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
index bb60b382654..15247608e1b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
@@ -2965,6 +2965,17 @@ public class CSS implements Serializable {
             }
             return image;
         }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(svalue);
+        }
+
+        @Override
+        public boolean equals(Object val) {
+            return val instanceof CSS.BackgroundImage img
+                   && Objects.equals(svalue, img.svalue);
+        }
     }
 
     /**
diff --git a/test/jdk/javax/swing/text/html/CSS/CSSAttributeEqualityBug.java b/test/jdk/javax/swing/text/html/CSS/CSSAttributeEqualityBug.java
index 304f1e83542..aa7a294c57b 100644
--- a/test/jdk/javax/swing/text/html/CSS/CSSAttributeEqualityBug.java
+++ b/test/jdk/javax/swing/text/html/CSS/CSSAttributeEqualityBug.java
@@ -31,7 +31,7 @@ import javax.swing.text.html.StyleSheet;
 
 /*
  * @test
- * @bug 7083187
+ * @bug 7083187 8318113
  * @summary  Verifies if CSS.CSSValue attribute is same
  * @run main CSSAttributeEqualityBug
  */
@@ -72,6 +72,9 @@ public class CSSAttributeEqualityBug {
             "background-position: 1em 2em",
 
             "border-width: medium",
+
+            "background-image: none",
+            "background-image: url(image.png)",
     };
 
     /**
@@ -86,6 +89,8 @@ public class CSSAttributeEqualityBug {
             {"margin-top: 42px", "margin-top: 22px"},
             {"margin-top: 42px", "margin-top: 42pt"},
             {"margin-top: 100%", "margin-top: 50%"},
+
+            {"background-image: none", "background-image: url(image.png)"},
     };
 
     private static final String[][] EQUALS_WITH_SPACE = {