fix: Improved HEAD request fail test when fallback-ing to GET request

.gitignore

@@ -6,5 +6,6 @@ docs/api/
 coverage/
 .DS_Store
 .vscode
+.idea
 .babel-cache
-.idea/
+/_mytest/

lib/hls/hls_parser.js

@@ -3771,7 +3771,9 @@ shaka.hls.HlsParser = class {
 
       contentMimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+         error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         headRequest.method = 'GET';
         const response = await this.makeNetworkRequest_(
             headRequest, requestType, {type});

lib/net/networking_utils.js

@@ -37,7 +37,9 @@ shaka.net.NetworkingUtils = class {
       const response = await netEngine.request(type, request).promise;
       mimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+          error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         request.method = 'GET';
         const response = await netEngine.request(type, request).promise;
         mimeType = response.headers['content-type'];

lib/text/ui_text_displayer.js

@@ -574,6 +574,36 @@ shaka.text.UITextDisplayer = class {
     return Cue.positionAlign.CENTER;
   }
 
+  /**
+   * Compute cue position in case position is 'auto' or null
+   * See https://www.w3.org/TR/webvtt1/#webvtt-cue-position
+   *
+   * @param {!shaka.text.Cue} cue
+   * @private
+   */
+  computeCuePosition_(cue) {
+    const Cue = shaka.text.Cue;
+    const {position, textAlign} = cue;
+
+    if (position !== null) {
+      // Position not null: use it
+      return position;
+    }
+
+    // Position is null: use text align to compute its value
+
+    if (textAlign === Cue.textAlign.LEFT) {
+      return 0;
+    }
+
+    if (textAlign === Cue.textAlign.RIGHT) {
+      return 100;
+    }
+
+    // Text align is: START, END or CENTER
+    return 50;
+  }
+
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.text.Cue} cue
@@ -697,6 +727,11 @@ shaka.text.UITextDisplayer = class {
     style.fontSize = shaka.text.UITextDisplayer.convertLengthValue_(
         cue.fontSize, cue, this.videoContainer_);
 
+    style.lineHeight = cue.lineHeight;
+    style.textAlign = cue.textAlign;
+    style.textDecoration = cue.textDecoration.join(' ');
+    style.writingMode = cue.writingMode;
+
     // The line attribute defines the positioning of the text container inside
     // the video container.
     // - The line offsets the text container from the top, the right or left of
@@ -759,31 +794,73 @@ shaka.text.UITextDisplayer = class {
       }
     }
 
-    style.lineHeight = cue.lineHeight;
+    const computedPositionAlign = this.computeCuePositionAlignment_(cue);
+    const computedPosition = this.computeCuePosition_(cue);
+
+    // The positionAlign attribute is an alignment for the text container in
+    // the dimension of the writing direction.
+    if (computedPositionAlign === Cue.positionAlign.LEFT) {
+      style.alignItems = 'flex-start';
+    } else if (computedPositionAlign === Cue.positionAlign.RIGHT) {
+      style.alignItems = 'flex-end';
+    }
 
     // The position defines the indent of the text container in the
     // direction defined by the writing direction.
-    if (cue.position != null) {
-      if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
-        style.paddingLeft = cue.position;
+    // TODO: factorize code since width/height, left/top and right/bottom
+    //       have same role, depending on the writing mode
+    if (cue.writingMode === Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
+      // Horizontal writing
+      if (computedPositionAlign === Cue.positionAlign.LEFT) {
+        // Left side of cue box is positioned at 'computedPosition'
+        style.paddingLeft = computedPosition + '%';
+        style.width = (100 - computedPosition) + '%';
+      } else if (computedPositionAlign === Cue.positionAlign.RIGHT) {
+        // Right side of cue box is positioned at 'computedPosition'
+        style.paddingRight = (100 - computedPosition) + '%';
+        style.width = computedPosition + '%';
       } else {
-        style.paddingTop = cue.position;
+        // Position is 'center'
+        // Horizontal center of cue box is positioned at 'computedPosition'
+        if (computedPosition > 50) {
+          // Center of cue box is in the right part of the viewport
+          const width = (100 - computedPosition) * 2;
+          style.width = width + '%';
+          style.paddingLeft = (100 - width) + '%';
+        } else if (computedPosition < 50) {
+          // Center of cue box is in the left part of the viewport
+          const width = computedPosition * 2;
+          style.width = width + '%';
+          style.paddingRight = (100 - width) + '%';
+        }
+      }
+    } else {
+      // Vertical writing
+      if (computedPositionAlign === Cue.positionAlign.LEFT) {
+        // Top side of cue box is positioned at 'computedPosition'
+        style.paddingTop = computedPosition + '%';
+        style.height = (100 - computedPosition) + '%';
+      } else if (computedPositionAlign === Cue.positionAlign.RIGHT) {
+        // Bottom side of cue box is positioned at 'computedPosition'
+        style.paddingBottom = (100 - computedPosition) + '%';
+        style.height = computedPosition + '%';
+      } else {
+        // Position is 'center'
+        // Vertical center of cue box is positioned at 'computedPosition'
+        if (computedPosition > 50) {
+          // Center of cue box is in the bottom part of the viewport
+          const height = (100 - computedPosition) * 2;
+          style.height = height + '%';
+          style.paddingTop = (100 - height) + '%';
+        } else if (computedPosition < 50) {
+          // Center of cue box is the top part of the viewport
+          const height = computedPosition * 2;
+          style.height = height + '%';
+          style.paddingBottom = (100 - height) + '%';
+        }
       }
     }
 
-    // The positionAlign attribute is an alignment for the text container in
-    // the dimension of the writing direction.
-    const computedPositionAlign = this.computeCuePositionAlignment_(cue);
-    if (computedPositionAlign == Cue.positionAlign.LEFT) {
-      style.cssFloat = 'left';
-    } else if (computedPositionAlign == Cue.positionAlign.RIGHT) {
-      style.cssFloat = 'right';
-    }
-
-    style.textAlign = cue.textAlign;
-    style.textDecoration = cue.textDecoration.join(' ');
-    style.writingMode = cue.writingMode;
-
     // Old versions of Chromium, which may be found in certain versions of Tizen
     // and WebOS, may require the prefixed version: webkitWritingMode.
     // https://caniuse.com/css-writing-mode