modules/controls/src/main/java/javafx/scene/control/TextInputControl.java

*** 67,76 ****
--- 67,77 ----
  import java.util.Collections;
  import java.util.List;
  
  import com.sun.javafx.util.Utils;
  import com.sun.javafx.binding.ExpressionHelper;
+ import com.sun.javafx.scene.NodeHelper;
  import javafx.util.StringConverter;
  
  /**
   * Abstract base class for text input controls.
   * @since JavaFX 2.0
*** 201,211 ****
  
                  @Override
                  public void applyStyle(StyleOrigin newOrigin, Font value) {
  
                      //
!                     // RT-20727 - if CSS is setting the font, then make sure invalidate doesn't call impl_reapplyCSS
                      //
                      try {
                          // super.applyStyle calls set which might throw if value is bound.
                          // Have to make sure fontSetByCss is reset.
                          fontSetByCss = true;
--- 202,212 ----
  
                  @Override
                  public void applyStyle(StyleOrigin newOrigin, Font value) {
  
                      //
!                     // RT-20727 - if CSS is setting the font, then make sure invalidate doesn't call NodeHelper.reapplyCSS
                      //
                      try {
                          // super.applyStyle calls set which might throw if value is bound.
                          // Have to make sure fontSetByCss is reset.
                          fontSetByCss = true;
*** 232,242 ****
                  protected void invalidated() {
                      // RT-20727 - if font is changed by calling setFont, then
                      // css might need to be reapplied since font size affects
                      // calculated values for styles with relative values
                      if(fontSetByCss == false) {
!                         TextInputControl.this.impl_reapplyCSS();
                      }
                  }
  
                  @Override
                  public CssMetaData<TextInputControl,Font> getCssMetaData() {
--- 233,243 ----
                  protected void invalidated() {
                      // RT-20727 - if font is changed by calling setFont, then
                      // css might need to be reapplied since font size affects
                      // calculated values for styles with relative values
                      if(fontSetByCss == false) {
!                         NodeHelper.reapplyCSS(TextInputControl.this);
                      }
                  }
  
                  @Override
                  public CssMetaData<TextInputControl,Font> getCssMetaData() {