shaka-player 4.12.9 → 4.13.0

package/lib/polyfill/all.js

@@ -53,6 +53,6 @@ shaka.polyfill = class {
 
 /**
  * Contains the polyfills that will be installed.
- * @private {!Array.<{priority: number, callback: function()}>}
+ * @private {!Array<{priority: number, callback: function()}>}
  */
 shaka.polyfill.polyfills_ = [];

package/lib/polyfill/media_capabilities.js

@@ -7,9 +7,9 @@
 goog.provide('shaka.polyfill.MediaCapabilities');
 
 goog.require('shaka.log');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.media.Capabilities');
 goog.require('shaka.polyfill');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Platform');
 
@@ -89,7 +89,7 @@ shaka.polyfill.MediaCapabilities = class {
 
   /**
    * @param {!MediaDecodingConfiguration} mediaDecodingConfig
-   * @return {!Promise.<!MediaCapabilitiesDecodingInfo>}
+   * @return {!Promise<!MediaCapabilitiesDecodingInfo>}
    * @private
    */
   static async decodingInfo_(mediaDecodingConfig) {
@@ -291,14 +291,14 @@ shaka.polyfill.MediaCapabilities = class {
     /** @type {MediaKeySystemAccess} */
     let keySystemAccess = null;
     try {
-      if (shaka.util.DrmUtils.hasMediaKeySystemAccess(
+      if (shaka.drm.DrmUtils.hasMediaKeySystemAccess(
           videoCodec, audioCodec, keySystem)) {
-        keySystemAccess = shaka.util.DrmUtils.getMediaKeySystemAccess(
+        keySystemAccess = shaka.drm.DrmUtils.getMediaKeySystemAccess(
             videoCodec, audioCodec, keySystem);
       } else {
         keySystemAccess = await navigator.requestMediaKeySystemAccess(
             mcapKeySystemConfig.keySystem, [mediaKeySystemConfig]);
-        shaka.util.DrmUtils.setMediaKeySystemAccess(
+        shaka.drm.DrmUtils.setMediaKeySystemAccess(
             videoCodec, audioCodec, keySystem, keySystemAccess);
       }
     } catch (e) {

package/lib/polyfill/patchedmediakeys_apple.js

@@ -7,10 +7,10 @@
 goog.provide('shaka.polyfill.PatchedMediaKeysApple');
 
 goog.require('goog.asserts');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.log');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
@@ -124,8 +124,8 @@ shaka.polyfill.PatchedMediaKeysApple = class {
    *
    * @this {!Navigator}
    * @param {string} keySystem
-   * @param {!Array.<!MediaKeySystemConfiguration>} supportedConfigurations
-   * @return {!Promise.<!MediaKeySystemAccess>}
+   * @param {!Array<!MediaKeySystemConfiguration>} supportedConfigurations
+   * @return {!Promise<!MediaKeySystemAccess>}
    */
   static requestMediaKeySystemAccess(keySystem, supportedConfigurations) {
     shaka.log.debug('PatchedMediaKeysApple.requestMediaKeySystemAccess');
@@ -245,7 +245,7 @@ shaka.polyfill.PatchedMediaKeysApple = class {
 shaka.polyfill.PatchedMediaKeysApple.MediaKeySystemAccess = class {
   /**
    * @param {string} keySystem
-   * @param {!Array.<!MediaKeySystemConfiguration>} supportedConfigurations
+   * @param {!Array<!MediaKeySystemConfiguration>} supportedConfigurations
    */
   constructor(keySystem, supportedConfigurations) {
     shaka.log.debug('PatchedMediaKeysApple.MediaKeySystemAccess');
@@ -746,7 +746,7 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
   /** @override */
   forEach(fn) {
     if (this.status_) {
-      fn(this.status_, shaka.util.DrmUtils.DUMMY_KEY_ID.value());
+      fn(this.status_, shaka.drm.DrmUtils.DUMMY_KEY_ID.value());
     }
   }
 
@@ -760,7 +760,7 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
 
   /** @override */
   has(keyId) {
-    const fakeKeyId = shaka.util.DrmUtils.DUMMY_KEY_ID.value();
+    const fakeKeyId = shaka.drm.DrmUtils.DUMMY_KEY_ID.value();
     if (this.status_ && shaka.util.BufferUtils.equal(keyId, fakeKeyId)) {
       return true;
     }

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -7,10 +7,10 @@
 goog.provide('shaka.polyfill.PatchedMediaKeysWebkit');
 
 goog.require('goog.asserts');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.log');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
@@ -97,8 +97,8 @@ shaka.polyfill.PatchedMediaKeysWebkit = class {
    *
    * @this {!Navigator}
    * @param {string} keySystem
-   * @param {!Array.<!MediaKeySystemConfiguration>} supportedConfigurations
-   * @return {!Promise.<!MediaKeySystemAccess>}
+   * @param {!Array<!MediaKeySystemConfiguration>} supportedConfigurations
+   * @return {!Promise<!MediaKeySystemAccess>}
    */
   static requestMediaKeySystemAccess(keySystem, supportedConfigurations) {
     shaka.log.debug('PatchedMediaKeysWebkit.requestMediaKeySystemAccess');
@@ -185,7 +185,7 @@ shaka.polyfill.PatchedMediaKeysWebkit = class {
 shaka.polyfill.PatchedMediaKeysWebkit.MediaKeySystemAccess = class {
   /**
    * @param {string} keySystem
-   * @param {!Array.<!MediaKeySystemConfiguration>} supportedConfigurations
+   * @param {!Array<!MediaKeySystemConfiguration>} supportedConfigurations
    */
   constructor(keySystem, supportedConfigurations) {
     shaka.log.debug('PatchedMediaKeysWebkit.MediaKeySystemAccess');
@@ -340,12 +340,12 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeys = class {
     this.eventManager_ = new shaka.util.EventManager();
 
     /**
-     * @private {Array.<!shaka.polyfill.PatchedMediaKeysWebkit.MediaKeySession>}
+     * @private {Array<!shaka.polyfill.PatchedMediaKeysWebkit.MediaKeySession>}
      */
     this.newSessions_ = [];
 
     /**
-     * @private {!Map.<string,
+     * @private {!Map<string,
      *                 !shaka.polyfill.PatchedMediaKeysWebkit.MediaKeySession>}
      */
     this.sessionMap_ = new Map();
@@ -924,7 +924,7 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
   /** @override */
   forEach(fn) {
     if (this.status_) {
-      fn(this.status_, shaka.util.DrmUtils.DUMMY_KEY_ID.value());
+      fn(this.status_, shaka.drm.DrmUtils.DUMMY_KEY_ID.value());
     }
   }
 
@@ -938,7 +938,7 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeyStatusMap = class {
 
   /** @override */
   has(keyId) {
-    const fakeKeyId = shaka.util.DrmUtils.DUMMY_KEY_ID.value();
+    const fakeKeyId = shaka.drm.DrmUtils.DUMMY_KEY_ID.value();
     if (this.status_ && shaka.util.BufferUtils.equal(keyId, fakeKeyId)) {
       return true;
     }

package/lib/polyfill/video_play_promise.js

@@ -27,7 +27,6 @@ shaka.polyfill.VideoPlayPromise = class {
       const originalPlay = HTMLMediaElement.prototype.play;
       // eslint-disable-next-line no-restricted-syntax
       HTMLMediaElement.prototype.play = function() {
-        // eslint-disable-next-line no-restricted-syntax
         const p = originalPlay.apply(this);
         if (p) {
           // This browser is returning a Promise from play().

package/lib/text/cue.js

@@ -236,7 +236,7 @@ shaka.text.Cue = class {
     /**
      * Text decoration. A combination of underline, overline
      * and line through. Empty array means no decoration.
-     * @type {!Array.<!shaka.text.Cue.textDecoration>}
+     * @type {!Array<!shaka.text.Cue.textDecoration>}
      * @export
      */
     this.textDecoration = [];
@@ -280,7 +280,7 @@ shaka.text.Cue = class {
      * Nested cues, which should be laid out horizontally in one block.
      * Top-level cues are blocks, and nested cues are inline elements.
      * Cues can be nested arbitrarily deeply.
-     * @type {!Array.<!shaka.text.Cue>}
+     * @type {!Array<!shaka.text.Cue>}
      * @export
      */
     this.nestedCues = [];
@@ -764,6 +764,7 @@ shaka.text.Cue = class {
   /**
    * @param {string} value
    * @param {string} defaultValue
+   * @return {string}
    * @private
    */
   static getOrDefault_(value, defaultValue) {

package/lib/text/lrc_text_parser.js

@@ -58,7 +58,7 @@ shaka.text.LrcTextParser = class {
     /** @type {shaka.text.Cue} */
     let prevCue = null;
 
-    /** @type {!Array.<!shaka.text.Cue>} */
+    /** @type {!Array<!shaka.text.Cue>} */
     const cues = [];
     const lines = str.split(/\r?\n/);
     for (const line of lines) {

package/lib/text/mp4_ttml_parser.js

@@ -83,7 +83,7 @@ shaka.text.Mp4TtmlParser = class {
     let sawMDAT = false;
     let payload = [];
 
-    /** @type {!Array.<number>} */
+    /** @type {!Array<number>} */
     let subSizes = [];
 
     const parser = new Mp4Parser()

package/lib/text/mp4_vtt_parser.js

@@ -122,11 +122,11 @@ shaka.text.Mp4VttParser = class {
     const Mp4Parser = shaka.util.Mp4Parser;
 
     let baseTime = 0;
-    /** @type {!Array.<shaka.util.ParsedTRUNSample>} */
+    /** @type {!Array<shaka.util.ParsedTRUNSample>} */
     let presentations = [];
     /** @type {!Uint8Array} */
     let rawPayload;
-    /** @type {!Array.<shaka.text.Cue>} */
+    /** @type {!Array<shaka.text.Cue>} */
     const cues = [];
 
     let sawTFDT = false;
@@ -258,7 +258,7 @@ shaka.text.Mp4VttParser = class {
         'MDAT which contain VTT cues and non-VTT data are not currently ' +
         'supported!');
 
-    return /** @type {!Array.<!shaka.text.Cue>} */ (
+    return /** @type {!Array<!shaka.text.Cue>} */ (
       cues.filter(shaka.util.Functional.isNotNull));
   }
 

package/lib/text/sbv_text_parser.js

@@ -57,7 +57,7 @@ shaka.text.SbvTextParser = class {
     // trim white space start and end
     str = str.trim();
 
-    /** @type {!Array.<!shaka.text.Cue>} */
+    /** @type {!Array<!shaka.text.Cue>} */
     const cues = [];
 
     // Supports no cues

package/lib/text/ssa_text_parser.js

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+// cspell:ignore AABBGGRR HAABBGGRR
+
 goog.provide('shaka.text.SsaTextParser');
 
 goog.require('goog.asserts');
@@ -128,7 +130,7 @@ shaka.text.SsaTextParser = class {
     }
 
     // Process cues
-    /** @type {!Array.<!shaka.text.Cue>} */
+    /** @type {!Array<!shaka.text.Cue>} */
     const cues = [];
 
     // Used to be able to iterate over the event parameters.

package/lib/text/stub_text_displayer.js

@@ -7,11 +7,11 @@
 goog.provide('shaka.text.StubTextDisplayer');
 
 /**
-* A stub text displayer plugin that does nothing
-*
-* @implements {shaka.extern.TextDisplayer}
-* @export
-*/
+ * A stub text displayer plugin that does nothing
+ *
+ * @implements {shaka.extern.TextDisplayer}
+ * @export
+ */
 shaka.text.StubTextDisplayer = class {
   /**
    * @override

package/lib/text/text_engine.js

@@ -63,7 +63,8 @@ shaka.text.TextEngine = class {
      * re-fetching the video segments they were embedded in.
      * Structure of closed caption map:
      * closed caption id -> {start and end time -> cues}
-     * @private {!Map.<string, !Map.<string, !Array.<shaka.text.Cue>>>} */
+     * @private {!Map<string, !Map<string, !Array<shaka.text.Cue>>>}
+     */
     this.closedCaptionsMap_ = new Map();
   }
 
@@ -355,7 +356,7 @@ shaka.text.TextEngine = class {
     const captionsMap = this.closedCaptionsMap_.get(id);
     if (captionsMap) {
       for (const startAndEndTime of captionsMap.keys()) {
-        /** @type {Array.<!shaka.text.Cue>} */
+        /** @type {Array<!shaka.text.Cue>} */
         const cues = captionsMap.get(startAndEndTime)
             .filter((c) => c.endTime <= bufferEndTime);
         if (cues) {
@@ -391,7 +392,7 @@ shaka.text.TextEngine = class {
   storeAndAppendClosedCaptions(
       closedCaptions, startTime, endTime, videoTimestampOffset) {
     const startAndEndTime = startTime + ' ' + endTime;
-    /** @type {!Map.<string, !Map.<string, !Array.<!shaka.text.Cue>>>} */
+    /** @type {!Map<string, !Map<string, !Array<!shaka.text.Cue>>>} */
     const captionsMap = new Map();
 
     for (const caption of closedCaptions) {
@@ -468,5 +469,5 @@ shaka.text.TextEngine = class {
   }
 };
 
-/** @private {!Object.<string, !shaka.extern.TextParserPlugin>} */
+/** @private {!Object<string, !shaka.extern.TextParserPlugin>} */
 shaka.text.TextEngine.parserMap_ = {};

package/lib/text/text_utils.js

@@ -148,9 +148,9 @@ shaka.text.Utils = class {
    * this, we only call flattenPayload() starting at elements marked as
    * isContainer = false.
    *
-   * @param {!Array.<!shaka.text.Cue>} cues
+   * @param {!Array<!shaka.text.Cue>} cues
    * @param {?shaka.text.Cue=} parentCue
-   * @return {!Array.<!shaka.text.Cue>}
+   * @return {!Array<!shaka.text.Cue>}
    */
   static getCuesToFlatten(cues, parentCue) {
     const result = [];
@@ -170,8 +170,8 @@ shaka.text.Utils = class {
   }
 
   /**
-   * @param {!Array.<!shaka.text.Cue>} cues
-   * @return {!Array.<!shaka.text.Cue>}
+   * @param {!Array<!shaka.text.Cue>} cues
+   * @return {!Array<!shaka.text.Cue>}
    */
   static removeDuplicates(cues) {
     const uniqueCues = [];

package/lib/text/ttml_text_parser.js

@@ -169,16 +169,16 @@ shaka.text.TtmlTextParser = class {
    * @param {!shaka.extern.xml.Node} cueNode
    * @param {shaka.extern.TextParser.TimeContext} timeContext
    * @param {!shaka.text.TtmlTextParser.RateInfo_} rateInfo
-   * @param {!Array.<!shaka.extern.xml.Node>} metadataElements
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
-   * @param {!Array.<!shaka.extern.xml.Node>} regionElements
-   * @param {!Array.<!shaka.text.CueRegion>} cueRegions
+   * @param {!Array<!shaka.extern.xml.Node>} metadataElements
+   * @param {!Array<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} regionElements
+   * @param {!Array<!shaka.text.CueRegion>} cueRegions
    * @param {boolean} collapseMultipleSpaces
    * @param {?{columns: number, rows: number}} cellResolution
    * @param {?shaka.extern.xml.Node} parentCueElement
    * @param {boolean} isContent
    * @param {?(string|undefined)} uri
-   * @param {!Array.<string>} images
+   * @param {!Array<string>} images
    * @return {shaka.text.Cue}
    * @private
    */
@@ -430,7 +430,7 @@ shaka.text.TtmlTextParser = class {
    * Parses an Element into a TextTrackCue or VTTCue.
    *
    * @param {!shaka.extern.xml.Node} regionElement
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * Defined in the top of tt element and used principally for images.
    * @param {?string} globalExtent
    * @return {shaka.text.CueRegion}
@@ -545,7 +545,7 @@ shaka.text.TtmlTextParser = class {
    * @param {shaka.extern.xml.Node} region
    * @param {shaka.extern.xml.Node} imageElement
    * @param {?string} imageUri
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * @param {boolean} isNested
    * @param {boolean} isLeaf
    * @private
@@ -567,7 +567,7 @@ shaka.text.TtmlTextParser = class {
       cue.direction = Cue.direction.HORIZONTAL_RIGHT_TO_LEFT;
     }
 
-    // Direction attribute specifies one-dimentional writing direction
+    // Direction attribute specifies one-dimensional writing direction
     // (left to right or right to left). Writing mode specifies that
     // plus whether text is vertical or horizontal.
     // They should not contradict each other. If they do, we give
@@ -598,7 +598,7 @@ shaka.text.TtmlTextParser = class {
       cue.textAlign = Cue.textAlign[align.toUpperCase()];
     } else {
       // Default value is START in the TTML spec: https://bit.ly/32OGmvo
-      // But to make the subtitle render consitent with other players and the
+      // But to make the subtitle render consistent with other players and the
       // shaka.text.Cue we use CENTER
       cue.textAlign = Cue.textAlign.CENTER;
     }
@@ -654,6 +654,7 @@ shaka.text.TtmlTextParser = class {
           cue.fontFamily = 'sans-serif';
           break;
         case 'monospaceSansSerif':
+          // cspell: disable-next-line
           cue.fontFamily = 'Consolas,monospace';
           break;
         case 'proportionalSerif':
@@ -860,7 +861,7 @@ shaka.text.TtmlTextParser = class {
    *
    * @param {!shaka.extern.xml.Node} cueElement
    * @param {shaka.extern.xml.Node} region
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * @param {string} attribute
    * @param {boolean=} shouldInheritRegionStyles
    * @return {?string}
@@ -889,7 +890,7 @@ shaka.text.TtmlTextParser = class {
    * and returns the value if the attribute was found.
    *
    * @param {shaka.extern.xml.Node} region
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * @param {string} attribute
    * @return {?string}
    * @private
@@ -916,7 +917,7 @@ shaka.text.TtmlTextParser = class {
    * if the attribute was found.
    *
    * @param {!shaka.extern.xml.Node} cueElement
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * @param {string} attribute
    * @return {?string}
    * @private
@@ -944,7 +945,7 @@ shaka.text.TtmlTextParser = class {
    * styles inherit from.
    *
    * @param {!shaka.extern.xml.Node} element
-   * @param {!Array.<!shaka.extern.xml.Node>} styles
+   * @param {!Array<!shaka.extern.xml.Node>} styles
    * @param {string} attribute
    * @return {?string}
    * @private
@@ -999,10 +1000,10 @@ shaka.text.TtmlTextParser = class {
    *
    * @param {shaka.extern.xml.Node} element
    * @param {string} attributeName
-   * @param {!Array.<shaka.extern.xml.Node>} collection
+   * @param {!Array<shaka.extern.xml.Node>} collection
    * @param {string} prefixName
    * @param {string=} nsName
-   * @return {!Array.<!shaka.extern.xml.Node>}
+   * @return {!Array<!shaka.extern.xml.Node>}
    * @private
    */
   static getElementsFromCollection_(
@@ -1401,7 +1402,7 @@ shaka.text.TtmlTextParser.timeHMSFormat_ =
 
 /**
  * @const
- * @private {!Object.<string, shaka.text.Cue.lineAlign>}
+ * @private {!Object<string, shaka.text.Cue.lineAlign>}
  */
 shaka.text.TtmlTextParser.textAlignToLineAlign_ = {
   'left': shaka.text.Cue.lineAlign.START,
@@ -1413,7 +1414,7 @@ shaka.text.TtmlTextParser.textAlignToLineAlign_ = {
 
 /**
  * @const
- * @private {!Object.<string, shaka.text.Cue.positionAlign>}
+ * @private {!Object<string, shaka.text.Cue.positionAlign>}
  */
 shaka.text.TtmlTextParser.textAlignToPositionAlign_ = {
   'left': shaka.text.Cue.positionAlign.LEFT,
@@ -1426,7 +1427,7 @@ shaka.text.TtmlTextParser.textAlignToPositionAlign_ = {
  * document, not just "ttp:", so we use this with getAttributeNS() to ensure
  * that we support arbitrary namespace names.
  *
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  * @private
  */
 shaka.text.TtmlTextParser.parameterNs_ = [
@@ -1439,7 +1440,7 @@ shaka.text.TtmlTextParser.parameterNs_ = [
  * document, not just "tts:", so we use this with getAttributeNS() to ensure
  * that we support arbitrary namespace names.
  *
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  * @private
  */
 shaka.text.TtmlTextParser.styleNs_ = [
@@ -1459,7 +1460,7 @@ shaka.text.TtmlTextParser.styleEbuttsNs_ = 'urn:ebu:tt:style';
 
 /**
  * The supported namespace URLs for SMPTE fields.
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  * @private
  */
 shaka.text.TtmlTextParser.smpteNsList_ = [

package/lib/text/ui_text_displayer.js

@@ -43,7 +43,7 @@ shaka.text.UITextDisplayer = class {
     /** @private {boolean} */
     this.isTextVisible_ = false;
 
-    /** @private {!Array.<!shaka.text.Cue>} */
+    /** @private {!Array<!shaka.text.Cue>} */
     this.cues_ = [];
 
     /** @private {HTMLMediaElement} */
@@ -82,7 +82,7 @@ shaka.text.UITextDisplayer = class {
     /**
      * Maps cues to cue elements. Specifically points out the wrapper element of
      * the cue (e.g. the HTML element to put nested cues inside).
-     * @private {Map.<!shaka.text.Cue, !{
+     * @private {Map<!shaka.text.Cue, !{
      *   cueElement: !HTMLElement,
      *   regionElement: HTMLElement,
      *   wrapper: !HTMLElement
@@ -127,7 +127,7 @@ shaka.text.UITextDisplayer = class {
       this.resizeObserver_.observe(this.textContainer_);
     }
 
-    /** @private {Map.<string, !HTMLElement>} */
+    /** @private {Map<string, !HTMLElement>} */
     this.regionElements_ = new Map();
   }
 
@@ -148,7 +148,7 @@ shaka.text.UITextDisplayer = class {
    * @export
    */
   append(cues) {
-    // Clone the cues list for performace optimization. We can avoid the cues
+    // Clone the cues list for performance optimization. We can avoid the cues
     // list growing during the comparisons for duplicate cues.
     // See: https://github.com/shaka-project/shaka-player/issues/3018
     const cuesList = [...this.cues_];
@@ -279,10 +279,10 @@ shaka.text.UITextDisplayer = class {
   }
 
   /**
-   * @param {!Array.<!shaka.text.Cue>} cues
+   * @param {!Array<!shaka.text.Cue>} cues
    * @param {!HTMLElement} container
    * @param {number} currentTime
-   * @param {!Array.<!shaka.text.Cue>} parents
+   * @param {!Array<!shaka.text.Cue>} parents
    * @private
    */
   updateCuesRecursive_(cues, container, currentTime, parents) {
@@ -294,14 +294,14 @@ shaka.text.UITextDisplayer = class {
      * Some of these elements may be added back again, if their corresponding
      * cue is in toPlant.
      * These elements are only removed if updateDOM is true.
-     * @type {!Array.<!HTMLElement>}
+     * @type {!Array<!HTMLElement>}
      */
     const toUproot = [];
     /**
      * The cues whose corresponding elements should be in the DOM.
      * Some of these might be new, some might have been displayed beforehand.
      * These will only be added if updateDOM is true.
-     * @type {!Array.<!shaka.text.Cue>}
+     * @type {!Array<!shaka.text.Cue>}
      */
     const toPlant = [];
     for (const cue of cues) {
@@ -560,7 +560,7 @@ shaka.text.UITextDisplayer = class {
    * Creates the object for a cue.
    *
    * @param {!shaka.text.Cue} cue
-   * @param {!Array.<!shaka.text.Cue>} parents
+   * @param {!Array<!shaka.text.Cue>} parents
    * @private
    */
   createCue_(cue, parents) {
@@ -641,7 +641,7 @@ shaka.text.UITextDisplayer = class {
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.text.Cue} cue
-   * @param {!Array.<!shaka.text.Cue>} parents
+   * @param {!Array<!shaka.text.Cue>} parents
    * @param {boolean} hasWrapper
    * @private
    */
@@ -933,7 +933,7 @@ shaka.text.UITextDisplayer = class {
    * @param {HTMLElement} videoContainer
    * @return {string}
    * @private
-  */
+   */
   static convertLengthValue_(lengthValue, cue, videoContainer) {
     const lengthValueInfo =
         shaka.text.UITextDisplayer.getLengthValueInfo_(lengthValue);
@@ -965,7 +965,7 @@ shaka.text.UITextDisplayer = class {
    * @return {string}
    *
    * @private
-   * */
+   */
   static getAbsoluteLengthInPixels_(value, cue, videoContainer) {
     const containerHeight = videoContainer.clientHeight;
 
@@ -977,7 +977,7 @@ shaka.text.UITextDisplayer = class {
    * it is assumed to be inherited from the parent. This returns null if the
    * value isn't found.
    *
-   * @param {!Array.<!shaka.text.Cue>} parents
+   * @param {!Array<!shaka.text.Cue>} parents
    * @param {function(!shaka.text.Cue):?T} cb
    * @return {?T}
    * @template T