src/java.desktop/share/classes/sun/font/FontDesignMetrics.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2018, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2019, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 23,48 ****
   * questions.
   */
  
  package sun.font;
  
- import java.lang.ref.ReferenceQueue;
- import java.lang.ref.SoftReference;
- 
- import java.awt.FontMetrics;
  import java.awt.Font;
  import java.awt.GraphicsEnvironment;
- import java.awt.geom.AffineTransform;
- import java.awt.geom.NoninvertibleTransformException;
- import java.awt.geom.Rectangle2D;
  import java.awt.font.FontRenderContext;
  import java.awt.font.TextLayout;
! 
  import java.io.IOException;
  import java.io.ObjectInputStream;
  import java.io.ObjectOutputStream;
! 
  import java.util.concurrent.ConcurrentHashMap;
  
  import sun.java2d.Disposer;
  import sun.java2d.DisposerRecord;
  
--- 23,44 ----
   * questions.
   */
  
  package sun.font;
  
  import java.awt.Font;
+ import java.awt.FontMetrics;
  import java.awt.GraphicsEnvironment;
  import java.awt.font.FontRenderContext;
  import java.awt.font.TextLayout;
! import java.awt.geom.AffineTransform;
! import java.awt.geom.Rectangle2D;
  import java.io.IOException;
  import java.io.ObjectInputStream;
  import java.io.ObjectOutputStream;
! import java.lang.ref.ReferenceQueue;
! import java.lang.ref.SoftReference;
  import java.util.concurrent.ConcurrentHashMap;
  
  import sun.java2d.Disposer;
  import sun.java2d.DisposerRecord;
  
*** 261,271 ****
           * new instance in this case.
           * Note that currently Swing native L&F composites are not handled
           * by this code as they use the metrics of the physical anyway.
           */
          SunFontManager fm = SunFontManager.getInstance();
!         if (fm.maybeUsingAlternateCompositeFonts() &&
              FontUtilities.getFont2D(font) instanceof CompositeFont) {
              return new FontDesignMetrics(font, frc);
          }
  
          FontDesignMetrics m = null;
--- 257,267 ----
           * new instance in this case.
           * Note that currently Swing native L&F composites are not handled
           * by this code as they use the metrics of the physical anyway.
           */
          SunFontManager fm = SunFontManager.getInstance();
!         if (fm.usingAlternateCompositeFonts() &&
              FontUtilities.getFont2D(font) instanceof CompositeFont) {
              return new FontDesignMetrics(font, frc);
          }
  
          FontDesignMetrics m = null;