src/share/classes/sun/font/GlyphLayout.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2008, 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) 2003, 2014, 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
*** 90,100 ****
      private LayoutEngineFactory _lef;  // set when get is called, unset when done is called
      private TextRecord _textRecord;    // the text we're working on, used by iterators
      private ScriptRun _scriptRuns;     // iterator over script runs
      private FontRunIterator _fontRuns; // iterator over physical fonts in a composite
      private int _ercount;
!     private ArrayList _erecords;
      private Point2D.Float _pt;
      private FontStrikeDesc _sd;
      private float[] _mat;
      private int _typo_flags;
      private int _offset;
--- 90,100 ----
      private LayoutEngineFactory _lef;  // set when get is called, unset when done is called
      private TextRecord _textRecord;    // the text we're working on, used by iterators
      private ScriptRun _scriptRuns;     // iterator over script runs
      private FontRunIterator _fontRuns; // iterator over physical fonts in a composite
      private int _ercount;
!     private ArrayList<EngineRecord> _erecords;
      private Point2D.Float _pt;
      private FontStrikeDesc _sd;
      private float[] _mat;
      private int _typo_flags;
      private int _offset;
*** 455,465 ****
          }
  
          //        _sd.init(dtx, gtx, font.getStyle(), frc.isAntiAliased(), frc.usesFractionalMetrics());
          _sd = txinfo.sd;
          for (;ix != stop; ix += dir) {
!             EngineRecord er = (EngineRecord)_erecords.get(ix);
              for (;;) {
                  try {
                      er.layout();
                      break;
                  }
--- 455,465 ----
          }
  
          //        _sd.init(dtx, gtx, font.getStyle(), frc.isAntiAliased(), frc.usesFractionalMetrics());
          _sd = txinfo.sd;
          for (;ix != stop; ix += dir) {
!             EngineRecord er = _erecords.get(ix);
              for (;;) {
                  try {
                      er.layout();
                      break;
                  }
*** 503,513 ****
      private GlyphLayout() {
          this._gvdata = new GVData();
          this._textRecord = new TextRecord();
          this._scriptRuns = new ScriptRun();
          this._fontRuns = new FontRunIterator();
!         this._erecords = new ArrayList(10);
          this._pt = new Point2D.Float();
          this._sd = new FontStrikeDesc();
          this._mat = new float[4];
      }
  
--- 503,513 ----
      private GlyphLayout() {
          this._gvdata = new GVData();
          this._textRecord = new TextRecord();
          this._scriptRuns = new ScriptRun();
          this._fontRuns = new FontRunIterator();
!         this._erecords = new ArrayList<>(10);
          this._pt = new Point2D.Float();
          this._sd = new FontStrikeDesc();
          this._mat = new float[4];
      }
  
*** 521,531 ****
          EngineRecord er = null;
          if (_ercount == _erecords.size()) {
              er = new EngineRecord();
              _erecords.add(er);
          } else {
!             er = (EngineRecord)_erecords.get(_ercount);
          }
          er.init(start, limit, font, script, lang, gmask);
          ++_ercount;
      }
  
--- 521,531 ----
          EngineRecord er = null;
          if (_ercount == _erecords.size()) {
              er = new EngineRecord();
              _erecords.add(er);
          } else {
!             er = _erecords.get(_ercount);
          }
          er.init(start, limit, font, script, lang, gmask);
          ++_ercount;
      }