--- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java 2014-02-13 11:40:04.560356100 -0800 +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java 2014-02-13 11:40:04.290356100 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -26,6 +26,7 @@ package com.sun.javafx.tk.quantum; import com.sun.javafx.logging.PulseLogger; +import static com.sun.javafx.logging.PulseLogger.PULSE_LOGGING_ENABLED; import com.sun.prism.Graphics; import com.sun.prism.GraphicsPipeline; import com.sun.prism.impl.Disposer; @@ -89,26 +90,19 @@ paintImpl(g); } - long start = PulseLogger.PULSE_LOGGING_ENABLED ? System.currentTimeMillis() : 0; + if (PULSE_LOGGING_ENABLED) PulseLogger.newPhase("Presenting"); if (!presentable.prepare(null)) { disposePresentable(); sceneState.getScene().entireSceneNeedsRepaint(); - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderMessage(start, System.currentTimeMillis(), "Presentable.prepare"); - } return; } /* present for vsync buffer swap */ - start = PulseLogger.PULSE_LOGGING_ENABLED ? System.currentTimeMillis() : 0; if (vs.getDoPresent()) { if (!presentable.present()) { disposePresentable(); sceneState.getScene().entireSceneNeedsRepaint(); } - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderMessage(start, System.currentTimeMillis(), "Presentable.present"); - } } } } catch (Throwable th) { @@ -128,9 +122,6 @@ ManagedResource.freeDisposalRequestedAndCheckResources(errored); renderLock.unlock(); - if (PulseLogger.PULSE_LOGGING_ENABLED) { - PulseLogger.PULSE_LOGGER.renderMessage(System.currentTimeMillis(), System.currentTimeMillis(), "Finished Presenting Painter"); - } } } }