modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCFontImpl.java

*** 30,54 ****
  import com.sun.javafx.font.FontResource;
  import com.sun.javafx.font.FontStrike;
  import com.sun.javafx.font.PGFont;
  import com.sun.javafx.geom.BaseBounds;
  import com.sun.javafx.geom.transform.BaseTransform;
  import com.sun.javafx.scene.text.GlyphList;
  import com.sun.javafx.scene.text.TextLayout;
  import com.sun.javafx.text.TextRun;
  import static com.sun.javafx.webkit.prism.TextUtilities.getLayoutWidth;
  import static com.sun.javafx.webkit.prism.TextUtilities.getLayoutBounds;
  import com.sun.prism.GraphicsPipeline;
  import com.sun.webkit.graphics.WCFont;
  import com.sun.webkit.graphics.WCGlyphBuffer;
  import java.util.HashMap;
- import java.util.logging.Level;
- import java.util.logging.Logger;
  
  final class WCFontImpl extends WCFont {
!     private final static Logger log =
!         Logger.getLogger(WCFontImpl.class.getName());
  
      private static final HashMap<String, String> FONT_MAP = new HashMap<String, String>();
  
      static WCFont getFont(String name, boolean bold, boolean italic, float size) {
          FontFactory factory = GraphicsPipeline.getPipeline().getFontFactory();
--- 30,54 ----
  import com.sun.javafx.font.FontResource;
  import com.sun.javafx.font.FontStrike;
  import com.sun.javafx.font.PGFont;
  import com.sun.javafx.geom.BaseBounds;
  import com.sun.javafx.geom.transform.BaseTransform;
+ import com.sun.javafx.logging.PlatformLogger;
+ import com.sun.javafx.logging.PlatformLogger.Level;
  import com.sun.javafx.scene.text.GlyphList;
  import com.sun.javafx.scene.text.TextLayout;
  import com.sun.javafx.text.TextRun;
  import static com.sun.javafx.webkit.prism.TextUtilities.getLayoutWidth;
  import static com.sun.javafx.webkit.prism.TextUtilities.getLayoutBounds;
  import com.sun.prism.GraphicsPipeline;
  import com.sun.webkit.graphics.WCFont;
  import com.sun.webkit.graphics.WCGlyphBuffer;
  import java.util.HashMap;
  
  final class WCFontImpl extends WCFont {
!     private final static PlatformLogger log =
!             PlatformLogger.getLogger(WCFontImpl.class.getName());
  
      private static final HashMap<String, String> FONT_MAP = new HashMap<String, String>();
  
      static WCFont getFont(String name, boolean bold, boolean italic, float size) {
          FontFactory factory = GraphicsPipeline.getPipeline().getFontFactory();
*** 204,247 ****
  
      public float getAscent() {
          // REMIND: This method needs to require a render context.
          float res = - getFontStrike().getMetrics().getAscent();
          if (log.isLoggable(Level.FINER)) {
!             log.log(Level.FINER, "getAscent({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getDescent() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getDescent();
          if (log.isLoggable(Level.FINER)) {
!             log.log(Level.FINER, "getDescent({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getLineSpacing() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getLineHeight();
          if (log.isLoggable(Level.FINER)) {
!             log.log(Level.FINER, "getLineSpacing({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getLineGap() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getLineGap();
          if (log.isLoggable(Level.FINER)) {
!             log.log(Level.FINER, "getLineGap({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res });
          }
          return res;
      }
--- 204,247 ----
  
      public float getAscent() {
          // REMIND: This method needs to require a render context.
          float res = - getFontStrike().getMetrics().getAscent();
          if (log.isLoggable(Level.FINER)) {
!             log.finer("getAscent({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getDescent() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getDescent();
          if (log.isLoggable(Level.FINER)) {
!             log.finer("getDescent({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getLineSpacing() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getLineHeight();
          if (log.isLoggable(Level.FINER)) {
!             log.finer("getLineSpacing({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res});
          }
          return res;
      }
  
      public float getLineGap() {
          // REMIND: This method needs to require a render context.
          float res = getFontStrike().getMetrics().getLineGap();
          if (log.isLoggable(Level.FINER)) {
!             log.finer("getLineGap({0}, {1}) = {2}",
                      new Object[] {font.getName(), font.getSize(),
                      res });
          }
          return res;
      }