src/java.desktop/share/classes/java/awt/Font.java

*** 42,51 ****
--- 42,53 ----
  import java.text.AttributedCharacterIterator.Attribute;
  import java.text.CharacterIterator;
  import java.util.Hashtable;
  import java.util.Locale;
  import java.util.Map;
+ 
+ import sun.awt.ComponentFactory;
  import sun.font.StandardGlyphVector;
  
  import sun.font.AttributeMap;
  import sun.font.AttributeValues;
  import sun.font.CompositeFont;
*** 444,454 ****
       */
      @SuppressWarnings("deprecation")
      private FontPeer getFontPeer() {
          if(peer == null) {
              Toolkit tk = Toolkit.getDefaultToolkit();
!             peer = tk.getFontPeer(name, style);
          }
          return peer;
      }
  
      /**
--- 446,458 ----
       */
      @SuppressWarnings("deprecation")
      private FontPeer getFontPeer() {
          if(peer == null) {
              Toolkit tk = Toolkit.getDefaultToolkit();
!             if (tk instanceof ComponentFactory) {
!                 peer = ((ComponentFactory) tk).getFontPeer(name, style);
!             }
          }
          return peer;
      }
  
      /**