8342460: Remove calls to doPrivileged in javafx.web

Reviewed-by: kcr, arapte
kevinrushforth · Nov 6, 2024 · 3d15a30 · 3d15a30
1 parent 71c6b16
commit 3d15a30
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 318 deletions.
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -41,9 +41,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -111,31 +108,20 @@ private WebEngine getWebEngine() {
         return accessor.getEngine();
     }
 
-    @SuppressWarnings("removal")
-    private AccessControlContext getAccessContext() {
-        return accessor.getPage().getAccessControlContext();
-    }
-
     @Override public WebPage createPage(
             boolean menu, boolean status, boolean toolbar, boolean resizable) {
         final WebEngine w = getWebEngine();
         if (w != null && w.getCreatePopupHandler() != null) {
             final PopupFeatures pf =
                     new PopupFeatures(menu, status, toolbar, resizable);
-            @SuppressWarnings("removal")
-            WebEngine popup = AccessController.doPrivileged(
-                    (PrivilegedAction<WebEngine>) () -> w.getCreatePopupHandler().call(pf), getAccessContext());
+            WebEngine popup = w.getCreatePopupHandler().call(pf);
             return Accessor.getPageFor(popup);
         }
         return null;
     }
 
-    @SuppressWarnings("removal")
     private void dispatchWebEvent(final EventHandler handler, final WebEvent ev) {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            handler.handle(ev);
-            return null;
-        }, getAccessContext());
+        handler.handle(ev);
     }
 
     private void notifyVisibilityChanged(boolean visible) {
@@ -197,23 +183,19 @@ private void notifyVisibilityChanged(boolean visible) {
         }
     }
 
-    @SuppressWarnings("removal")
     @Override public boolean confirm(final String text) {
         final WebEngine w = getWebEngine();
         if (w != null && w.getConfirmHandler() != null) {
-            return AccessController.doPrivileged(
-                    (PrivilegedAction<Boolean>) () -> w.getConfirmHandler().call(text), getAccessContext());
+            return w.getConfirmHandler().call(text);
         }
         return false;
     }
 
-    @SuppressWarnings("removal")
     @Override public String prompt(String text, String defaultValue) {
         final WebEngine w = getWebEngine();
         if (w != null && w.getPromptHandler() != null) {
             final PromptData data = new PromptData(text, defaultValue);
-            return AccessController.doPrivileged(
-                    (PrivilegedAction<String>) () -> w.getPromptHandler().call(data), getAccessContext());
+            return w.getPromptHandler().call(data);
         }
         return "";
     }

diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -27,8 +27,6 @@
 
 import com.sun.javafx.scene.NodeHelper;
 import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 import com.sun.javafx.scene.traversal.Direction;
 import com.sun.javafx.scene.traversal.TraversalMethod;
@@ -50,10 +48,8 @@
 import com.sun.webkit.graphics.WCRectangle;
 
 public final class WebPageClientImpl implements WebPageClient<WebView> {
-    @SuppressWarnings("removal")
-    private static final boolean backBufferSupported = Boolean.valueOf(
-        AccessController.doPrivileged((PrivilegedAction<String>) () -> System.getProperty(
-            "com.sun.webkit.pagebackbuffer", "true")));
+    private static final boolean backBufferSupported =
+        Boolean.valueOf(System.getProperty("com.sun.webkit.pagebackbuffer", "true"));
     private static WebConsoleListener consoleListener = null;
     private final Accessor accessor;
 

diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -53,8 +53,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -81,10 +79,8 @@ public enum Type {
 
     private final static PlatformLogger log =
             PlatformLogger.getLogger(WCGraphicsPrismContext.class.getName());
-    @SuppressWarnings("removal")
-    private final static boolean DEBUG_DRAW_CLIP_SHAPE = Boolean.valueOf(
-            AccessController.doPrivileged((PrivilegedAction<String>) () ->
-            System.getProperty("com.sun.webkit.debugDrawClipShape", "false")));
+    private final static boolean DEBUG_DRAW_CLIP_SHAPE =
+        Boolean.valueOf(System.getProperty("com.sun.webkit.debugDrawClipShape", "false"));
 
     Graphics baseGraphics;
     private BaseTransform baseTransform;

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java b/modules/javafx.web/src/main/java/com/sun/webkit/Disposer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -32,7 +32,6 @@
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -59,24 +58,20 @@ public final class Disposer implements Runnable {
             new HashSet<>();
 
     static {
-        @SuppressWarnings("removal")
-        var dummy = java.security.AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            /*
-             * The thread must be a member of a thread group
-             * which will not get GCed before VM exit.
-             * Make its parent the top-level thread group.
-             */
-            ThreadGroup tg = Thread.currentThread().getThreadGroup();
-            for (ThreadGroup tgn = tg;
-                    tgn != null;
-                    tg = tgn, tgn = tg.getParent());
-
-            Thread t = new Thread(tg, disposerInstance, "Disposer");
-            t.setDaemon(true);
-            t.setPriority(Thread.MAX_PRIORITY);
-            t.start();
-            return null;
-        });
+        /*
+         * The thread must be a member of a thread group
+         * which will not get GCed before VM exit.
+         * Make its parent the top-level thread group.
+         */
+        ThreadGroup tg = Thread.currentThread().getThreadGroup();
+        for (ThreadGroup tgn = tg;
+                tgn != null;
+                tg = tgn, tgn = tg.getParent());
+
+        Thread t = new Thread(tg, disposerInstance, "Disposer");
+        t.setDaemon(true);
+        t.setPriority(Thread.MAX_PRIORITY);
+        t.start();
     }
 
     /**

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java b/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -28,18 +28,13 @@
 import com.sun.javafx.reflect.MethodUtil;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import com.sun.javafx.reflect.ReflectUtil;
 
 /**
  * Utility class to wrap method invocation.
  */
 public class MethodHelper {
-    @SuppressWarnings("removal")
-    private static final boolean logAccessErrors
-            = AccessController.doPrivileged((PrivilegedAction<Boolean>) ()
-                    -> Boolean.getBoolean("sun.reflect.debugModuleAccessChecks"));
+    private static final boolean logAccessErrors = Boolean.getBoolean("sun.reflect.debugModuleAccessChecks");
 
     private static final Module trampolineModule = MethodUtil.getTrampolineModule();
 

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java b/modules/javafx.web/src/main/java/com/sun/webkit/Timer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -25,9 +25,6 @@
 
 package com.sun.webkit;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 public class Timer {
     private static Timer instance;
     private static Mode mode;
@@ -42,12 +39,9 @@ public static enum Mode {
         SEPARATE_THREAD
     }
 
-    @SuppressWarnings("removal")
     public synchronized static Mode getMode() {
         if (mode == null) {
-            mode = Boolean.valueOf(AccessController.doPrivileged(
-                    (PrivilegedAction<String>) () -> System.getProperty(
-                            "com.sun.webkit.platformticks", "true"))) ? Mode.PLATFORM_TICKS : Mode.SEPARATE_THREAD;
+            mode = Boolean.valueOf(System.getProperty("com.sun.webkit.platformticks", "true")) ? Mode.PLATFORM_TICKS : Mode.SEPARATE_THREAD;
         }
         return mode;
     }

diff --git a/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java b/modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -28,9 +28,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Set;
 
@@ -120,16 +117,10 @@ private static Object fwkInvokeWithContext(final Method method,
         }
 
         try {
-            return AccessController.doPrivileged((PrivilegedExceptionAction<Object>)
-                    () -> MethodHelper.invoke(method, instance, args), acc);
-        } catch (PrivilegedActionException ex) {
+            return MethodHelper.invoke(method, instance, args);
+        } catch (InvocationTargetException ex) {
             Throwable cause = ex.getCause();
-            if (cause == null)
-                cause = ex;
-            else if (cause instanceof InvocationTargetException
-                && cause.getCause() != null)
-                cause = cause.getCause();
-            throw cause;
+            throw cause != null ? cause : ex;
         }
     }
 }