--- old/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java	2016-01-25 00:13:35.000000000 +0400
+++ new/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java	2016-01-25 00:13:35.000000000 +0400
@@ -173,8 +173,9 @@
      */
     public int computeStringWidth(SynthContext ss, Font font,
                                   FontMetrics metrics, String text) {
-        return SwingUtilities2.stringWidth(ss.getComponent(), metrics,
-                                          text);
+        JComponent comp = ss.getComponent();
+        return SwingUtilities2.getTextUIDrawing(comp)
+                .getStringWidth(comp, metrics, text);
     }
 
     /**
@@ -347,8 +348,8 @@
             JComponent c = ss.getComponent();
             FontMetrics fm = SwingUtilities2.getFontMetrics(c, g);
             y += fm.getAscent();
-            SwingUtilities2.drawStringUnderlineCharAt(c, g, text,
-                                                      mnemonicIndex, x, y);
+            SwingUtilities2.getTextUIDrawing(c)
+                    .drawStringUnderlineCharAt(c, g, text, mnemonicIndex, x, y);
         }
     }