Commit d3a1b5ae authored by Victor Porof's avatar Victor Porof
Browse files

Bug 1561435 - Format toolkit/actors, a=automatic-formatting 

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D36050

--HG--
extra : source : 2540803fff7587f65dd5d6253b6fb544647e5e20
parent 57a6febc

.eslintrc.js

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ module.exports = { 
  "overrides": [{

      "files": [

        "devtools/**",

        "toolkit/**",

        "tools/**",

        "uriloader/**",

        "view/**",

.prettierignore

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ toolkit/components/telemetry/datareporting-prefs.js 
toolkit/components/telemetry/healthreport-prefs.js



# Ignore all top-level directories for now.

toolkit/**

tools/**

uriloader/**

view/**

toolkit/actors/AudioPlaybackChild.jsm

+5 −3
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ 


var EXPORTED_SYMBOLS = ["AudioPlaybackChild"];



const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");

const { ActorChild } = ChromeUtils.import(

  "resource://gre/modules/ActorChild.jsm"

);



class AudioPlaybackChild extends ActorChild {

  handleMediaControlMessage(msg) {
@@ -49,7 +51,7 @@ class AudioPlaybackChild extends ActorChild { 
        } else if (data === "activeMediaBlockStop") {

          name += "ActiveMediaBlockStop";

        } else {

          name += (data === "active") ? "Start" : "Stop";

          name += data === "active" ? "Start" : "Stop";

        }

        this.mm.sendAsyncMessage(name);

      }

toolkit/actors/BrowserElementChild.jsm

+7 −3
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ var EXPORTED_SYMBOLS = ["BrowserElementChild"]; 


class BrowserElementChild extends JSWindowActorChild {

  handleEvent(event) {

    if (event.type == "DOMWindowClose" &&

        !this.manager.browsingContext.parent) {

    if (

      event.type == "DOMWindowClose" &&

      !this.manager.browsingContext.parent

    ) {

      this.sendAsyncMessage("DOMWindowClose", {});

    }

  }
@@ -24,7 +26,9 @@ class BrowserElementChild extends JSWindowActorChild { 


        let permitUnload = true;

        if (docShell && docShell.contentViewer) {

          permitUnload = docShell.contentViewer.permitUnload(message.data.flags);

          permitUnload = docShell.contentViewer.permitUnload(

            message.data.flags

          );

        }



        this.sendAsyncMessage("Done", { permitUnload });

toolkit/actors/BrowserElementParent.jsm

+26 −12
Original line number Diff line number Diff line
@@ -6,12 +6,20 @@ 


var EXPORTED_SYMBOLS = ["BrowserElementParent", "PermitUnloader"];



ChromeUtils.defineModuleGetter(this, "Services",

  "resource://gre/modules/Services.jsm");



let {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

XPCOMUtils.defineLazyPreferenceGetter(this, "unloadTimeoutMs",

  "dom.beforeunload_timeout_ms");

ChromeUtils.defineModuleGetter(

  this,

  "Services",

  "resource://gre/modules/Services.jsm"

);



let { XPCOMUtils } = ChromeUtils.import(

  "resource://gre/modules/XPCOMUtils.jsm"

);

XPCOMUtils.defineLazyPreferenceGetter(

  this,

  "unloadTimeoutMs",

  "dom.beforeunload_timeout_ms"

);



// Out-of-process subframes might be in the following states following a request

// to permit closing:
@@ -74,9 +82,11 @@ class BrowserElementParent extends JSWindowActorParent { 
          // If this is a non-remote browser, the DOMWindowClose event will bubble

          // up naturally, and doesn't need to be re-dispatched.

          if (browser.isRemoteBrowser) {

            browser.dispatchEvent(new win.CustomEvent("DOMWindowClose", {

            browser.dispatchEvent(

              new win.CustomEvent("DOMWindowClose", {

                bubbles: true,

            }));

              })

            );

          }

        }

        break;
@@ -203,9 +213,13 @@ var PermitUnloader = { 
        actor.sendPermitUnload(flags);

      }



      timer.initWithCallback(() => {

      timer.initWithCallback(

        () => {

          this._onTimeout(frameLoader);

      }, unloadTimeoutMs, timer.TYPE_ONE_SHOT);

        },

        unloadTimeoutMs,

        timer.TYPE_ONE_SHOT

      );



      Services.tm.spinEventLoopUntilOrShutdown(() => {

        return this._finishedPermitUnload(frameStates);