jdk-sandbox: comparison jdk/src/share/classes/javax/swing/RepaintManager.java

equal deleted inserted replaced

-:4eb1062acb5b
+:129d7d8a7399
 package javax.swing;
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.peer.ComponentPeer;
-import java.awt.peer.ContainerPeer;
 import java.awt.image.VolatileImage;
+import java.security.AccessControlContext;
 import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.applet.*;
 import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
 import sun.awt.DisplayChangedListener;
 import sun.awt.SunToolkit;
 import sun.java2d.SunGraphicsEnvironment;
+import sun.misc.JavaSecurityAccess;
+import sun.misc.SharedSecrets;
 import sun.security.action.GetPropertyAction;
 import com.sun.java.swing.SwingUtilities3;
 /**
 /**
 * Runnable used to process all repaint/revalidate requests.
 */
 private final ProcessingRunnable processingRunnable;
+private final static JavaSecurityAccess javaSecurityAccess =
+SharedSecrets.getJavaSecurityAccess();
 static {
 volatileImageBufferEnabled = "true".equals(AccessController.
 doPrivileged(new GetPropertyAction(
 //
 // This is called from the toolkit thread when awt needs to run a
 // Runnable before we paint.
 //
-void nativeQueueSurfaceDataRunnable(AppContext appContext, Component c,
+void nativeQueueSurfaceDataRunnable(AppContext appContext,
-Runnable r) {
+final Component c, final Runnable r)
+{
 synchronized(this) {
 if (runnableList == null) {
 runnableList = new LinkedList<Runnable>();
 }
-runnableList.add(r);
+runnableList.add(new Runnable() {
+public void run() {
+AccessControlContext stack = AccessController.getContext();
+AccessControlContext acc =
+AWTAccessor.getComponentAccessor().getAccessControlContext(c);
+javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+public Void run() {
+r.run();
+return null;
+}
+}, stack, acc);
+}
+});
 }
 scheduleProcessingRunnable(appContext);
 }
 /**
 /**
 * Validate all of the components that have been marked invalid.
 * @see #addInvalidComponent
 */
 public void validateInvalidComponents() {
-java.util.List<Component> ic;
+final java.util.List<Component> ic;
 synchronized(this) {
-if(invalidComponents == null) {
+if (invalidComponents == null) {
 return;
 }
 ic = invalidComponents;
 invalidComponents = null;
 }
 int n = ic.size();
 for(int i = 0; i < n; i++) {
-ic.get(i).validate();
+final Component c = ic.get(i);
+AccessControlContext stack = AccessController.getContext();
+AccessControlContext acc =
+AWTAccessor.getComponentAccessor().getAccessControlContext(c);
+javaSecurityAccess.doIntersectionPrivilege(
+new PrivilegedAction<Void>() {
+public Void run() {
+c.validate();
+return null;
+}
+}, stack, acc);
 }
 }
 /**
 dirtyComponents.clear();
 }
 paintDirtyRegions(tmpDirtyComponents);
 }
-private void paintDirtyRegions(Map<Component,Rectangle>
+private void paintDirtyRegions(
-tmpDirtyComponents){
+final Map<Component,Rectangle> tmpDirtyComponents)
-int i, count;
+{
-java.util.List<Component> roots;
+if (tmpDirtyComponents.isEmpty()) {
-Component dirtyComponent;
-count = tmpDirtyComponents.size();
-if (count == 0) {
 return;
 }
-Rectangle rect;
+final java.util.List<Component> roots =
-int localBoundsX = 0;
+new ArrayList<Component>(tmpDirtyComponents.size());
-int localBoundsY = 0;
-int localBoundsH;
-int localBoundsW;
-roots = new ArrayList<Component>(count);
 for (Component dirty : tmpDirtyComponents.keySet()) {
 collectDirtyComponents(tmpDirtyComponents, dirty, roots);
 }
-count = roots.size();
+final AtomicInteger count = new AtomicInteger(roots.size());
 painting = true;
 try {
-for(i=0 ; i < count ; i++) {
+for (int j=0 ; j < count.get(); j++) {
-dirtyComponent = roots.get(i);
+final int i = j;
-rect = tmpDirtyComponents.get(dirtyComponent);
+final Component dirtyComponent = roots.get(j);
-// Sometimes when RepaintManager is changed during the painting
+AccessControlContext stack = AccessController.getContext();
-// we may get null here, see #6995769 for details
+AccessControlContext acc =
-if (rect == null) {
+AWTAccessor.getComponentAccessor().getAccessControlContext(dirtyComponent);
-continue;
+javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
-}
+public Void run() {
-localBoundsH = dirtyComponent.getHeight();
+Rectangle rect = tmpDirtyComponents.get(dirtyComponent);
-localBoundsW = dirtyComponent.getWidth();
+// Sometimes when RepaintManager is changed during the painting
+// we may get null here, see #6995769 for details
-SwingUtilities.computeIntersection(localBoundsX,
+if (rect == null) {
-localBoundsY,
+return null;
-localBoundsW,
-localBoundsH,
-rect);
-if (dirtyComponent instanceof JComponent) {
-((JComponent)dirtyComponent).paintImmediately(
-rect.x,rect.y,rect.width, rect.height);
-}
-else if (dirtyComponent.isShowing()) {
-Graphics g = JComponent.safelyGetGraphics(
-dirtyComponent, dirtyComponent);
-// If the Graphics goes away, it means someone disposed of
-// the window, don't do anything.
-if (g != null) {
-g.setClip(rect.x, rect.y, rect.width, rect.height);
-try {
-dirtyComponent.paint(g);
-} finally {
-g.dispose();
 }
+int localBoundsH = dirtyComponent.getHeight();
+int localBoundsW = dirtyComponent.getWidth();
+SwingUtilities.computeIntersection(0,
+0,
+localBoundsW,
+localBoundsH,
+rect);
+if (dirtyComponent instanceof JComponent) {
+((JComponent)dirtyComponent).paintImmediately(
+rect.x,rect.y,rect.width, rect.height);
+}
+else if (dirtyComponent.isShowing()) {
+Graphics g = JComponent.safelyGetGraphics(
+dirtyComponent, dirtyComponent);
+// If the Graphics goes away, it means someone disposed of
+// the window, don't do anything.
+if (g != null) {
+g.setClip(rect.x, rect.y, rect.width, rect.height);
+try {
+dirtyComponent.paint(g);
+} finally {
+g.dispose();
+}
+}
+}
+// If the repaintRoot has been set, service it now and
+// remove any components that are children of repaintRoot.
+if (repaintRoot != null) {
+adjustRoots(repaintRoot, roots, i + 1);
+count.set(roots.size());
+paintManager.isRepaintingRoot = true;
+repaintRoot.paintImmediately(0, 0, repaintRoot.getWidth(),
+repaintRoot.getHeight());
+paintManager.isRepaintingRoot = false;
+// Only service repaintRoot once.
+repaintRoot = null;
+}
+return null;
 }
-}
+}, stack, acc);
-// If the repaintRoot has been set, service it now and
-// remove any components that are children of repaintRoot.
-if (repaintRoot != null) {
-adjustRoots(repaintRoot, roots, i + 1);
-count = roots.size();
-paintManager.isRepaintingRoot = true;
-repaintRoot.paintImmediately(0, 0, repaintRoot.getWidth(),
-repaintRoot.getHeight());
-paintManager.isRepaintingRoot = false;
-// Only service repaintRoot once.
-repaintRoot = null;
-}
 }
 } finally {
 painting = false;
 }

changeset 16092	129d7d8a7399
parent 13233	4d45f7ebc0d7
child 18231	2948d734293d