--- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java 2014-02-13 11:39:52.738356100 -0800 +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java 2014-02-13 11:39:52.478356100 -0800 @@ -61,6 +61,7 @@ import com.sun.javafx.geom.transform.BaseTransform; import com.sun.javafx.geom.transform.GeneralTransform3D; import com.sun.javafx.logging.PulseLogger; +import static com.sun.javafx.logging.PulseLogger.PULSE_LOGGING_ENABLED; import com.sun.javafx.tk.Toolkit; import com.sun.prism.BasicStroke; import com.sun.prism.Graphics; @@ -628,8 +629,8 @@ cachedGraphics.translate(rect.x - outsetShapeBounds.getMinX(), rect.y - outsetShapeBounds.getMinY()); renderBackgroundShape(cachedGraphics); - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("Rendering region shape image to cache"); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("Rendering region shape image to cache"); } } } @@ -650,8 +651,8 @@ final float srcY2 = srcY1 + textureHeight; g.drawTexture(cached, dstX1, dstY1, dstX2, dstY2, srcX1, srcY1, srcX2, srcY2); - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("Cached region shape image used"); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("Cached region shape image used"); } } else { // no cache, rendering backgrounds directly to graphics @@ -684,9 +685,9 @@ } private void renderBackgroundShape(Graphics g) { - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("NGRegion renderBackgroundShape slow path"); - PulseLogger.PULSE_LOGGER.renderMessage("Slow shape path for " + getName()); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("NGRegion renderBackgroundShape slow path"); + PulseLogger.addMessage("Slow shape path for " + getName()); } // We first need to draw each background fill. We don't pay any attention @@ -828,8 +829,8 @@ // Rendering backgrounds to the cache renderBackgroundRectanglesDirectly(cacheGraphics, cacheWidth, cacheHeight); - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("Rendering region background image to cache"); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("Rendering region background image to cache"); } } } @@ -1061,8 +1062,8 @@ srcLeftX, srcTopY, srcRightX, srcBottomY); } - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("Cached region background image used"); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("Cached region background image used"); } } @@ -1110,9 +1111,9 @@ g.fillRoundRect(l, t, w, h, arcWidth, arcHeight); } } else { - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderIncrementCounter("NGRegion renderBackgrounds slow path"); - PulseLogger.PULSE_LOGGER.renderMessage("Slow background path for " + getName()); + if (PULSE_LOGGING_ENABLED) { + PulseLogger.incrementCounter("NGRegion renderBackgrounds slow path"); + PulseLogger.addMessage("Slow background path for " + getName()); } // The edges are not uniform, so we have to render each edge independently // TODO document the issue number which will give us a fast path for rendering