Implementation of Plugin/PluginArray/MimeType/MimeTypeArray rewritten…

…. The navigator properties plugins and mimeTypes returning static results in all browsers. Class PluginConfiguration removed, the config is static for all browsers. A bit more code cleanup - flash is finally gone.
HtmlUnit · Nov 20, 2024 · cff71d2 · cff71d2
1 parent 4104d0a
commit cff71d2
Show file tree

Hide file tree

Showing 17 changed files with 740 additions and 449 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,16 @@
 
     <body>
         <release version="4.7.0" date="November xx, 2024" description="Bugfixes, Chrome/Edge 131">
+            <action type="update" dev="rbri">
+                Implementation of Plugin/PluginArray/MimeType/MimeTypeArray rewritten. The navigator properties
+                plugins and mimeTypes returning static results in all browsers.
+            </action>
+            <action type="remove" dev="rbri">
+                Class PluginConfiguration removed, the config is static for all browsers.
+            </action>
+            <action type="update" dev="rbri">
+                A bit more code cleanup - flash is finally gone.
+            </action>
             <action type="update" dev="rbri">
                 Upgrade Apache commons-io to 2.18.0.
             </action>

diff --git a/src/main/java/org/htmlunit/BrowserVersion.java b/src/main/java/org/htmlunit/BrowserVersion.java
@@ -19,7 +19,6 @@
 import java.lang.reflect.Field;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -112,7 +111,6 @@ public final class BrowserVersion implements Serializable {
     /** The default browser version. */
     private static BrowserVersion DefaultBrowserVersion_ = BEST_SUPPORTED;
 
-    /* Register plugins for the browser versions. */
     static {
         FIREFOX_ESR.applicationVersion_ = "5.0 (Windows)";
         FIREFOX_ESR.userAgent_ = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:"
@@ -401,7 +399,6 @@ public final class BrowserVersion implements Serializable {
     private String platform_ = PLATFORM_WIN32;
     private TimeZone systemTimezone_ = TimeZone.getTimeZone(TIMEZONE_NEW_YORK);
     private String userAgent_;
-    private final Set<PluginConfiguration> plugins_;
     private final Set<BrowserVersionFeatures> features_;
     private String acceptEncodingHeader_;
     private String acceptLanguageHeader_;
@@ -436,7 +433,6 @@ public final class BrowserVersion implements Serializable {
         secClientHintUserAgentHeader_ = "";
         secClientHintUserAgentPlatformHeader_ = "\"Windows\"";
 
-        plugins_ = new HashSet<>();
         features_ = EnumSet.noneOf(BrowserVersionFeatures.class);
         uploadMimeTypes_ = new HashMap<>();
 
@@ -732,15 +728,6 @@ public String getSecClientHintUserAgentPlatformHeader() {
         return secClientHintUserAgentPlatformHeader_;
     }
 
-    /**
-     * Returns the available plugins. This makes only sense for Firefox as only this
-     * browser makes this kind of information available via JavaScript.
-     * @return the available plugins
-     */
-    public Set<PluginConfiguration> getPlugins() {
-        return plugins_;
-    }
-
     /**
      * Indicates if this instance has the given feature. Used for HtmlUnit internal processing.
      * @param property the property name
@@ -872,10 +859,6 @@ public BrowserVersionBuilder(final BrowserVersion version) {
                 .setHeaderNamesOrdered(version.getHeaderNamesOrdered())
                 .setFontHeights(version.fontHeights_);
 
-            for (final PluginConfiguration pluginConf : version.getPlugins()) {
-                workPiece_.plugins_.add(pluginConf.clone());
-            }
-
             workPiece_.features_.addAll(version.features_);
             workPiece_.uploadMimeTypes_.putAll(version.uploadMimeTypes_);
         }

diff --git a/src/main/java/org/htmlunit/PluginConfiguration.java b/src/main/java/org/htmlunit/PluginConfiguration.java
diff --git a/src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java b/src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java
@@ -56,7 +56,6 @@
 import org.htmlunit.javascript.host.Screen;
 import org.htmlunit.javascript.host.ScreenOrientation;
 import org.htmlunit.javascript.host.SharedWorker;
-import org.htmlunit.javascript.host.SimpleArray;
 import org.htmlunit.javascript.host.Storage;
 import org.htmlunit.javascript.host.StorageManager;
 import org.htmlunit.javascript.host.TextDecoder;
@@ -659,7 +658,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         Screen.class, ScreenOrientation.class, ScriptProcessorNode.class,
         SecurityPolicyViolationEvent.class, Selection.class, ServiceWorker.class, ServiceWorkerContainer.class,
         ServiceWorkerRegistration.class,
-        ShadowRoot.class, SharedWorker.class, SimpleArray.class, SourceBuffer.class, SourceBufferList.class,
+        ShadowRoot.class, SharedWorker.class, SourceBuffer.class, SourceBufferList.class,
         SpeechSynthesis.class, SpeechSynthesisErrorEvent.class, SpeechSynthesisEvent.class,
         SpeechSynthesisUtterance.class, SpeechSynthesisVoice.class,
         StereoPannerNode.class, Storage.class, StorageEvent.class, StorageManager.class,

diff --git a/src/main/java/org/htmlunit/javascript/host/MimeType.java b/src/main/java/org/htmlunit/javascript/host/MimeType.java
@@ -26,7 +26,7 @@
  * @author Ahmed Ashour
  * @author Ronald Brill
  *
- * @see <a href="http://www.xulplanet.com/references/objref/MimeType.html">XUL Planet</a>
+ * @see <a href="https://developer.mozilla.org/en-US/docs/Web/API/MimeType">MimeType</a>
  */
 @JsxClass
 public class MimeType extends HtmlUnitScriptable {
@@ -98,7 +98,7 @@ public String getType() {
      * @return the plugin
      */
     @JsxGetter
-    public Object getEnabledPlugin() {
+    public Plugin getEnabledPlugin() {
         return enabledPlugin_;
     }
 }