Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1633272 - do not track the PiP popped-out video in the Picture in Picture Toggle actor child, r=mconley

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D78727
This commit is contained in:
Gijs Kruitbosch 2020-06-09 18:30:51 +00:00
parent b1f63ced7e
commit 46a2f9355a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toolkit/actors/PictureInPictureChild.jsm
View File

@ -179,6 +179,17 @@ class PictureInPictureToggleChild extends JSWindowActorChild {
return;
}
if (gWeakPlayerContent) {
try {
if (this.contentWindow == gWeakPlayerContent.get()) {
// We also don't want events from the player window video itself!
return;
}
} catch (e) {
return;
}
}
switch (event.type) {
case "UAWidgetSetupOrChange": {
if (
@ -1195,6 +1206,11 @@ class PictureInPictureChild extends JSWindowActorChild {
});
}
// We're committed to adding the video to this window now. Ensure we track
// the content window before we do so, so that the toggle actor can
// distinguish this new video we're creating from web-controlled ones.
gWeakPlayerContent = Cu.getWeakReference(this.contentWindow);
let doc = this.document;
let playerVideo = doc.createElement("video");
@ -1225,8 +1241,6 @@ class PictureInPictureChild extends JSWindowActorChild {
},
{ once: true }
);
gWeakPlayerContent = Cu.getWeakReference(this.contentWindow);
}
play() {