Add more fixes

shaka-project · Feb 7, 2023 · 06fa86a · 06fa86a
1 parent 04cb00e
commit 06fa86a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/demo/close_button.js b/demo/close_button.js
@@ -31,6 +31,16 @@ shakaDemo.CloseButton = class extends shaka.ui.Element {
       shakaDemoMain.unload();
     });
 
+    if ('documentPictureInPicture' in window) {
+      window.documentPictureInPicture.addEventListener('enter', (event) => {
+        this.button_.style.display = 'none';
+        const pipWindow = window.documentPictureInPicture.window;
+        pipWindow.addEventListener('unload', (event) => {
+          this.button_.style.display = 'block';
+        });
+      });
+    }
+
     // TODO: Make sure that the screenreader description of this control is
     // localized!
   }

diff --git a/demo/main.js b/demo/main.js
@@ -1185,7 +1185,8 @@ shakaDemo.Main = class {
     if (document.pictureInPictureElement) {
       document.exitPictureInPicture();
     }
-    if (window.documentPictureInPicture.window) {
+    if (window.documentPictureInPicture &&
+        window.documentPictureInPicture.window) {
       window.documentPictureInPicture.window.close();
     }
     this.player_.unload();

diff --git a/externs/pictureinpicture.js b/externs/pictureinpicture.js
@@ -67,8 +67,12 @@ DocumentPictureInPicture.prototype.requestWindow = function(options) {};
 DocumentPictureInPicture.prototype.window;
 
 
-/** @type {?function(!Event)} */
-DocumentPictureInPicture.prototype.onenter;
+/**
+ * @param {string} type
+ * @param {Function} listener
+ */
+DocumentPictureInPicture.prototype.addEventListener =
+    function(type, listener) {};
 
 
 /**

diff --git a/ui/pip_button.js b/ui/pip_button.js
@@ -162,8 +162,7 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
     const pipPlayer = this.videoContainer_;
     const rectPipPlayer = pipPlayer.getBoundingClientRect();
     const pipWindow = await window.documentPictureInPicture.requestWindow({
-      width: rectPipPlayer.width,
-      height: rectPipPlayer.height,
+      initialAspectRatio: rectPipPlayer.width / rectPipPlayer.height,
       copyStyleSheets: true,
     });
 
@@ -186,7 +185,7 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
 
     // Listen for the PiP closing event to move the player back.
     pipWindow.addEventListener('unload', () => {
-      placeholder.replaceWith(pipPlayer);
+      placeholder.replaceWith(/** @type {!Node} */(pipPlayer));
     }, {once: true});
   }