Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1756388; r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D144193
This commit is contained in:
Edgar Chen 2022-05-03 19:11:30 +00:00
parent 527680376d
commit 177354af27
2 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
browser/actors/DOMFullscreenParent.jsm
View File

@ -48,20 +48,38 @@ class DOMFullscreenParent extends JSWindowActorParent {
}
}
/**
* Clean up fullscreen state and resume chrome UI if window is in fullscreen
* and this actor is the one where the original fullscreen enter or
* exit request comes.
*/
_cleanupFullscreenStateAndResumeChromeUI(aWindow) {
this.cleanupDomFullscreen(aWindow);
if (this.requestOrigin == this && aWindow.document.fullscreen) {
aWindow.windowUtils.remoteFrameFullscreenReverted();
}
}
didDestroy() {
this._didDestroy = true;
let window = this._fullscreenWindow;
if (!window) {
if (this.waitingForChildExitFullscreen) {
let topBrowsingContext = this.browsingContext.top;
let browser = topBrowsingContext.embedderElement;
if (!browser) {
return;
}
if (
this.waitingForChildExitFullscreen ||
this.waitingForChildEnterFullscreen
) {
this.waitingForChildExitFullscreen = false;
this.waitingForChildEnterFullscreen = false;
// We were destroyed while waiting for our DOMFullscreenChild to exit
// and have exited fullscreen, run cleanup steps anyway.
let topBrowsingContext = this.browsingContext.top;
let browser = topBrowsingContext.embedderElement;
if (browser) {
this.cleanupDomFullscreen(browser.ownerGlobal);
}
// or enter fullscreen, run cleanup steps anyway.
this._cleanupFullscreenStateAndResumeChromeUI(browser.ownerGlobal);
}
return;
}
@ -93,9 +111,9 @@ class DOMFullscreenParent extends JSWindowActorParent {
}
} else if (this.waitingForChildExitFullscreen) {
this.waitingForChildExitFullscreen = false;
// We were destroyed while waiting for our DOMFullscreenChild to exit and
// have exited fullscreen, run cleanup steps anyway.
this.cleanupDomFullscreen(window);
// We were destroyed while waiting for our DOMFullscreenChild to exit
// run cleanup steps anyway.
this._cleanupFullscreenStateAndResumeChromeUI(window);
}
this.updateFullscreenWindowReference(window);
}
@ -114,7 +132,6 @@ class DOMFullscreenParent extends JSWindowActorParent {
switch (aMessage.name) {
case "DOMFullscreen:Request": {
this.waitingForChildExitFullscreen = false;
this.nextMsgRecipient = null;
this.requestOrigin = this;
this.addListeners(window);
window.windowUtils.remoteFrameFullscreenChanged(browser);

41
browser/base/content/browser-fullScreenAndPointerLock.js
View File

@ -467,7 +467,12 @@ var FullScreen = {
// before the check is fine since we also check the activeness of
// the requesting document in content-side handling code.
if (this._isRemoteBrowser(aBrowser)) {
let [targetActor, inProcessBC] = this._getNextMsgRecipientActor(aActor);
// The cached message recipient in actor is used for fullscreen state
// cleanup, we should not use it while entering fullscreen.
let [targetActor, inProcessBC] = this._getNextMsgRecipientActor(
aActor,
false /* aUseCache */
);
if (!targetActor) {
// If there is no appropriate actor to send the message we have
// no way to complete the transition and should abort by exiting
@ -475,14 +480,14 @@ var FullScreen = {
this._abortEnterFullscreen();
return;
}
// Record that the actor is waiting for its child to enter
// fullscreen so that if it dies we can abort.
targetActor.waitingForChildEnterFullscreen = true;
targetActor.sendAsyncMessage("DOMFullscreen:Entered", {
remoteFrameBC: inProcessBC,
});
if (inProcessBC) {
// Record that the actor is waiting for its child to enter
// fullscreen so that if it dies we can abort.
targetActor.waitingForChildEnterFullscreen = true;
// We aren't messaging the request origin yet, skip this time.
return;
}
@ -559,17 +564,21 @@ var FullScreen = {
*/
cleanupDomFullscreen(aActor) {
let needToWaitForChildExit = false;
let [target, inProcessBC] = this._getNextMsgRecipientActor(aActor);
// Use the message recipient cached in the actor if possible, especially for
// the case that actor is destroyed, which we are unable to find it by
// walking up the browsing context tree.
let [target, inProcessBC] = this._getNextMsgRecipientActor(
aActor,
true /* aUseCache */
);
if (target) {
needToWaitForChildExit = true;
if (!target.waitingForChildExitFullscreen) {
// Record that the actor is waiting for its child to exit fullscreen so
// that if it dies we can continue cleanup.
target.waitingForChildExitFullscreen = true;
target.sendAsyncMessage("DOMFullscreen:CleanUp", {
remoteFrameBC: inProcessBC,
});
}
// Record that the actor is waiting for its child to exit fullscreen so
// that if it dies we can continue cleanup.
target.waitingForChildExitFullscreen = true;
target.sendAsyncMessage("DOMFullscreen:CleanUp", {
remoteFrameBC: inProcessBC,
});
if (inProcessBC) {
return needToWaitForChildExit;
}
@ -614,6 +623,8 @@ var FullScreen = {
*
* @param {JSWindowActorParent} aActor
* The actor that called this function.
* @param {bool} aUseCache
* Use the recipient cached in the aActor if available.
*
* @return {[JSWindowActorParent, BrowsingContext]}
* The parent actor which should be sent the next msg and the
@ -623,10 +634,10 @@ var FullScreen = {
* the calling actor has been destroyed or its associated
* WindowContext is in BFCache.
*/
_getNextMsgRecipientActor(aActor) {
_getNextMsgRecipientActor(aActor, aUseCache) {
// Walk up the cached nextMsgRecipient to find the next available actor if
// any.
if (aActor.nextMsgRecipient) {
if (aUseCache && aActor.nextMsgRecipient) {
let nextMsgRecipient = aActor.nextMsgRecipient;
while (nextMsgRecipient) {
let [actor] = nextMsgRecipient;