Merge m-c to autoland a=merge

MozReview-Commit-ID: LsPv9Mdodvf

accessible/base/Platform.h

@@ -45,7 +45,16 @@ bool ShouldA11yBeEnabled();
 #endif
 
 #if defined(XP_WIN)
+/*
+ * Do we have AccessibleHandler.dll registered.
+ */
 bool IsHandlerRegistered();
+
+/*
+ * Name of platform service that instantiated accessibility
+ */
+void SetInstantiator(const nsAString& aInstantiator);
+bool GetInstantiator(nsAString& aInstantiator);
 #endif
 
 /**

accessible/windows/msaa/LazyInstantiator.cpp

@@ -8,6 +8,7 @@
 
 #include "MainThreadUtils.h"
 #include "mozilla/a11y/Accessible.h"
+#include "mozilla/a11y/Platform.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/mscom/MainThreadRuntime.h"
 #include "mozilla/mscom/Registration.h"
@@ -262,6 +263,13 @@ LazyInstantiator::ShouldInstantiate(const DWORD aClientTid)
   }
   */
 
+  // Store full path to executable for support purposes.
+  nsAutoString filePath;
+  nsresult rv = clientExe->GetPath(filePath);
+  if (NS_SUCCEEDED(rv)) {
+    a11y::SetInstantiator(filePath);
+  }
+
 #if defined(MOZ_TELEMETRY_REPORTING) || defined(MOZ_CRASHREPORTER)
   if (!mTelemetryThread) {
     // Call GatherTelemetry on a background thread because it does I/O on

accessible/windows/msaa/Platform.cpp

@@ -30,6 +30,8 @@ static StaticAutoPtr<RegisteredProxy> gRegCustomProxy;
 static StaticAutoPtr<RegisteredProxy> gRegProxy;
 static StaticAutoPtr<RegisteredProxy> gRegAccTlb;
 static StaticAutoPtr<RegisteredProxy> gRegMiscTlb;
+static nsString* gInstantiator = nullptr;
+
 void
 a11y::PlatformInit()
 {
@@ -65,6 +67,11 @@ a11y::PlatformShutdown()
   gRegProxy = nullptr;
   gRegAccTlb = nullptr;
   gRegMiscTlb = nullptr;
+
+  if (gInstantiator) {
+    delete gInstantiator;
+    gInstantiator = nullptr;
+  }
 }
 
 void
@@ -206,3 +213,24 @@ a11y::IsHandlerRegistered()
 
   return true;
 }
+
+void
+a11y::SetInstantiator(const nsAString& aInstantiator)
+{
+  if (!gInstantiator) {
+    gInstantiator = new nsString();
+  }
+
+  gInstantiator->Assign(aInstantiator);
+}
+
+bool
+a11y::GetInstantiator(nsAString& aInstantiator)
+{
+  if (!gInstantiator) {
+    return false;
+  }
+
+  aInstantiator.Assign(*gInstantiator);
+  return true;
+}

browser/base/content/browser-sets.inc

@@ -34,7 +34,7 @@
     <command id="cmd_close" oncommand="BrowserCloseTabOrWindow()"/>
     <command id="cmd_closeWindow" oncommand="BrowserTryToCloseWindow()"/>
     <command id="cmd_toggleMute" oncommand="gBrowser.selectedTab.toggleMuteAudio()"/>
-    <command id="cmd_CustomizeToolbars" oncommand="BrowserCustomizeToolbar()"/>
+    <command id="cmd_CustomizeToolbars" oncommand="gCustomizeMode.enter()"/>
     <command id="cmd_quitApplication" oncommand="goQuitApplication()"/>
 
 

browser/base/content/browser-thumbnails.js

@@ -88,7 +88,7 @@ var gBrowserThumbnails = {
         this._delayedCapture(aEvent.target.linkedBrowser);
         break;
       case "TabClose": {
-        this._clearTimeout(aEvent.target.linkedBrowser);
+        this._cancelDelayedCapture(aEvent.target.linkedBrowser);
         break;
       }
     }
@@ -158,34 +158,56 @@ var gBrowserThumbnails = {
   },
 
   _delayedCapture: function Thumbnails_delayedCapture(aBrowser) {
-    if (this._timeouts.has(aBrowser))
-      clearTimeout(this._timeouts.get(aBrowser));
-    else
+    if (this._timeouts.has(aBrowser)) {
+      this._cancelDelayedCallbacks(aBrowser);
+    } else {
       aBrowser.addEventListener("scroll", this, true);
+    }
 
-    let timeout = setTimeout(() => {
-      this._clearTimeout(aBrowser);
+    let idleCallback = () => {
+      this._cancelDelayedCapture(aBrowser);
       this._capture(aBrowser);
+    };
+
+    // setTimeout to set a guarantee lower bound for the requestIdleCallback
+    // (and therefore the delayed capture)
+    let timeoutId = setTimeout(() => {
+      let idleCallbackId = requestIdleCallback(idleCallback, {
+        timeout: this._captureDelayMS * 30
+      });
+      this._timeouts.set(aBrowser, { isTimeout: false, id: idleCallbackId });
     }, this._captureDelayMS);
 
-    this._timeouts.set(aBrowser, timeout);
+    this._timeouts.set(aBrowser, { isTimeout: true, id: timeoutId });
   },
 
   _shouldCapture: function Thumbnails_shouldCapture(aBrowser, aCallback) {
-    // Capture only if it's the currently selected tab.
-    if (aBrowser != gBrowser.selectedBrowser) {
+    // Capture only if it's the currently selected tab and not an about: page.
+    if (aBrowser != gBrowser.selectedBrowser ||
+        gBrowser.currentURI.schemeIs("about")) {
       aCallback(false);
       return;
     }
     PageThumbs.shouldStoreThumbnail(aBrowser, aCallback);
   },
 
-  _clearTimeout: function Thumbnails_clearTimeout(aBrowser) {
+  _cancelDelayedCapture: function Thumbnails_cancelDelayedCapture(aBrowser) {
     if (this._timeouts.has(aBrowser)) {
       aBrowser.removeEventListener("scroll", this);
-      clearTimeout(this._timeouts.get(aBrowser));
+      this._cancelDelayedCallbacks(aBrowser);
       this._timeouts.delete(aBrowser);
     }
+  },
+
+  _cancelDelayedCallbacks: function Thumbnails_cancelDelayedCallbacks(aBrowser) {
+    let timeoutData = this._timeouts.get(aBrowser);
+
+    if (timeoutData.isTimeout) {
+      clearTimeout(timeoutData.id);
+    } else {
+      // idle callback dispatched
+      window.cancelIdleCallback(timeoutData.id);
+    }
   }
 };
 

browser/base/content/browser.js

@@ -1364,8 +1364,11 @@ var gBrowserInit = {
 
     gRemoteControl.updateVisualCue(Marionette.running);
 
+    let uriToLoad = this._getUriToLoad();
+    gIdentityHandler.initIdentityBlock(uriToLoad);
+
     // Wait until chrome is painted before executing code not critical to making the window visible
-    this._boundDelayedStartup = this._delayedStartup.bind(this);
+    this._boundDelayedStartup = this._delayedStartup.bind(this, uriToLoad);
     window.addEventListener("MozAfterPaint", this._boundDelayedStartup);
 
     this._loadHandled = true;
@@ -1376,7 +1379,7 @@ var gBrowserInit = {
     this._boundDelayedStartup = null;
   },
 
-  _delayedStartup() {
+  _delayedStartup(uriToLoad) {
     let tmp = {};
     Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
     let TelemetryTimestamps = tmp.TelemetryTimestamps;
@@ -1422,7 +1425,6 @@ var gBrowserInit = {
     // e.g., start/home page, command line / startup uris to load, sessionstore
     gAboutNewTabService.QueryInterface(Ci.nsISupports);
 
-    let uriToLoad = this._getUriToLoad();
     if (uriToLoad && uriToLoad != "about:blank") {
       if (uriToLoad instanceof Ci.nsIArray) {
         let count = uriToLoad.length;
@@ -4204,11 +4206,6 @@ function OpenBrowserWindow(options) {
   return win;
 }
 
-// Only here for backwards compat, we should remove this soon
-function BrowserCustomizeToolbar() {
-  gCustomizeMode.enter();
-}
-
 /**
  * Update the global flag that tracks whether or not any edit UI (the Edit menu,
  * edit-related items in the context menu, and edit-related toolbar buttons
@@ -7018,6 +7015,12 @@ var gIdentityHandler = {
    */
   _popupTriggeredByKeyboard: false,
 
+  /**
+   * RegExp used to decide if an about url should be shown as being part of
+   * the browser UI.
+   */
+  _secureInternalUIWhitelist: /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback)(?:[?#]|$)/i,
+
   get _isBroken() {
     return this._state & Ci.nsIWebProgressListener.STATE_IS_BROKEN;
   },
@@ -7646,6 +7649,14 @@ var gIdentityHandler = {
   },
 
   setURI(uri) {
+    // Ignore about:blank loads until the window's initial URL has loaded,
+    // to avoid hiding the UI that initIdentityBlock could have prepared.
+    if (this._ignoreAboutBlankUntilFirstLoad) {
+      if (uri.spec == "about:blank")
+        return;
+      this._ignoreAboutBlankUntilFirstLoad = false;
+    }
+
     this._uri = uri;
 
     try {
@@ -7655,8 +7666,8 @@ var gIdentityHandler = {
       this._uriHasHost = false;
     }
 
-    let whitelist = /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback)(?:[?#]|$)/i;
-    this._isSecureInternalUI = uri.schemeIs("about") && whitelist.test(uri.pathQueryRef);
+    this._isSecureInternalUI = uri.schemeIs("about") &&
+      this._secureInternalUIWhitelist.test(uri.pathQueryRef);
 
     this._isExtensionPage = uri.schemeIs("moz-extension");
 
@@ -7679,6 +7690,25 @@ var gIdentityHandler = {
     }
   },
 
+  /**
+   * Used to initialize the identity block before first paint to avoid
+   * flickering when opening a new window showing a secure internal page
+   * (eg. about:home)
+   */
+  initIdentityBlock(initialURI) {
+    if ((typeof initialURI != "string") || !initialURI.startsWith("about:"))
+      return;
+
+    let uri = Services.io.newURI(initialURI);
+    if (this._secureInternalUIWhitelist.test(uri.pathQueryRef)) {
+      this._isSecureInternalUI = true;
+      this._ignoreAboutBlankUntilFirstLoad = true;
+      this.refreshIdentityBlock();
+      // The identity label won't be visible without setting this.
+      gURLBar.setAttribute("pageproxystate", "valid");
+    }
+  },
+
   /**
    * Click handler for the identity-box element in primary chrome.
    */
@@ -8136,7 +8166,7 @@ function switchToTabHavingURI(aURI, aOpenNew, aOpenParams = {}) {
     // work correctly with URL objects - so treat them as strings
     let ignoreFragmentWhenComparing = typeof ignoreFragment == "string" &&
                                       ignoreFragment.startsWith("whenComparing");
-      let requestedCompare = cleanURL(
+    let requestedCompare = cleanURL(
           aURI.displaySpec, ignoreQueryString || replaceQueryString, ignoreFragmentWhenComparing);
     let browsers = aWindow.gBrowser.browsers;
     for (let i = 0; i < browsers.length; i++) {

browser/base/content/browser.xul

@@ -364,7 +364,7 @@
                     seeing the command event pass by. The observes attribute is
                     here so that the menuitem is still disabled and re-enabled
                     correctly. -->
-      <menuitem oncommand="BrowserCustomizeToolbar()"
+      <menuitem oncommand="gCustomizeMode.enter()"
                 observes="cmd_CustomizeToolbars"
                 class="viewCustomizeToolbar"
                 label="&viewCustomizeToolbar.label;"

browser/extensions/onboarding/content/onboarding.css

@@ -322,7 +322,8 @@
 }
 
 /* Keyboard focus specific outline */
-.onboarding-tour-action-button:-moz-focusring {
+.onboarding-tour-action-button:-moz-focusring,
+#onboarding-notification-action-btn:-moz-focusring {
   outline: 2px solid rgba(0,149,221,0.5);
   outline-offset: 1px;
   -moz-outline-radius: 2px;
@@ -492,7 +493,7 @@
   --height: 22px;
   --vpadding: 3px;
   position: absolute;
-  content: attr(data-tooltip);
+  content: attr(aria-label);
   top: 0;
   offset-inline-start: 73px;
   line-height: calc(var(--height) - var(--vpadding) * 2);
@@ -534,6 +535,7 @@
 
 #onboarding-notification-tour-title {
   margin: 0;
+  font-weight: bold;
 }
 
 #onboarding-notification-tour-icon {

browser/extensions/onboarding/content/onboarding.js

@@ -751,17 +751,19 @@ class Onboarding {
   }
 
   _renderNotificationBar() {
-    let div = this._window.document.createElement("div");
-    div.id = "onboarding-notification-bar";
+    let footer = this._window.document.createElement("footer");
+    footer.id = "onboarding-notification-bar";
+    footer.setAttribute("aria-live", "polite");
+    footer.setAttribute("aria-labelledby", "onboarding-notification-icon")
     // We use `innerHTML` for more friendly reading.
     // The security should be fine because this is not from an external input.
-    div.innerHTML = `
-      <div id="onboarding-notification-icon"></div>
-      <section id="onboarding-notification-message-section">
-        <div id="onboarding-notification-tour-icon"></div>
-        <div id="onboarding-notification-body">
-          <h6 id="onboarding-notification-tour-title"></h6>
-          <span id="onboarding-notification-tour-message"></span>
+    footer.innerHTML = `
+      <div id="onboarding-notification-icon" role="presentation"></div>
+      <section id="onboarding-notification-message-section" role="presentation">
+        <div id="onboarding-notification-tour-icon" role="presentation"></div>
+        <div id="onboarding-notification-body" role="presentation">
+          <h1 id="onboarding-notification-tour-title"></h1>
+          <p id="onboarding-notification-tour-message"></p>
         </div>
         <button id="onboarding-notification-action-btn"></button>
       </section>
@@ -771,12 +773,15 @@ class Onboarding {
       this._tourType === "new" ? "onboarding.notification-icon-tool-tip" :
                                  "onboarding.notification-icon-tooltip-updated",
       [BRAND_SHORT_NAME], 1);
-    div.querySelector("#onboarding-notification-icon").setAttribute("data-tooltip", toolTip);
 
-    let closeBtn = div.querySelector("#onboarding-notification-close-btn");
+    let icon = footer.querySelector("#onboarding-notification-icon");
+    icon.setAttribute("aria-label", toolTip);
+    icon.setAttribute("role", "presentation");
+
+    let closeBtn = footer.querySelector("#onboarding-notification-close-btn");
     closeBtn.setAttribute("title",
       this._bundle.GetStringFromName("onboarding.notification-close-button-tooltip"));
-    return div;
+    return footer;
   }
 
   hide() {

browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js

@@ -29,3 +29,37 @@ add_task(async function test_onboarding_overlay_button() {
 
   await BrowserTestUtils.removeTab(tab);
 });
+
+add_task(async function test_onboarding_notification_bar() {
+  resetOnboardingDefaultState();
+  skipMuteNotificationOnFirstSession();
+
+  let tab = await openTab(ABOUT_NEWTAB_URL);
+  await promiseOnboardingOverlayLoaded(tab.linkedBrowser);
+  await promiseTourNotificationOpened(tab.linkedBrowser);
+
+  info("Test accessibility and semantics of the notification bar");
+  await ContentTask.spawn(tab.linkedBrowser, {}, function() {
+    let doc = content.document;
+    let footer = doc.getElementById("onboarding-notification-bar");
+    let icon = doc.getElementById("onboarding-notification-icon")
+
+    is(footer.getAttribute("aria-live"), "polite",
+      "Notification bar should be a live region");
+    is(footer.getAttribute("aria-labelledby"), icon.id,
+      "Notification bar should be labelled by the notification icon text");
+    ok(icon.getAttribute("aria-label"),
+      "Notification icon should have a text alternative");
+    // Presentational elements
+    [
+      "onboarding-notification-icon",
+      "onboarding-notification-message-section",
+      "onboarding-notification-tour-icon",
+      "onboarding-notification-body"
+    ].forEach(id =>
+      is(doc.getElementById(id).getAttribute("role"), "presentation",
+        "Element is only used for presentation"));
+  });
+
+  await BrowserTestUtils.removeTab(tab);
+});

browser/extensions/pdfjs/README.mozilla

@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 1.8.605
+Current extension version is: 1.8.618
 
-Taken from upstream commit: ace9de6f
+Taken from upstream commit: 21cc2c02

browser/extensions/pdfjs/content/build/pdf.js

@@ -3826,8 +3826,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.8.605';
-  exports.build = build = 'ace9de6f';
+  exports.version = version = '1.8.618';
+  exports.build = build = '21cc2c02';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -4877,8 +4877,8 @@ if (!_util.globalScope.PDFJS) {
 }
 var PDFJS = _util.globalScope.PDFJS;
 {
-  PDFJS.version = '1.8.605';
-  PDFJS.build = 'ace9de6f';
+  PDFJS.version = '1.8.618';
+  PDFJS.build = '21cc2c02';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
@@ -10444,8 +10444,8 @@ exports.PDFDataTransportStream = PDFDataTransportStream;
 "use strict";
 
 
-var pdfjsVersion = '1.8.605';
-var pdfjsBuild = 'ace9de6f';
+var pdfjsVersion = '1.8.618';
+var pdfjsBuild = '21cc2c02';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(8);
 var pdfjsDisplayAPI = __w_pdfjs_require__(3);

browser/extensions/pdfjs/content/build/pdf.worker.js

@@ -17320,9 +17320,6 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           var fn = operation.fn;
           switch (fn | 0) {
             case _util.OPS.paintXObject:
-              if (args[0].code) {
-                break;
-              }
               var name = args[0].name;
               if (!name) {
                 (0, _util.warn)('XObject must be referred to by name.');
@@ -17904,9 +17901,6 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
               break;
             case _util.OPS.paintXObject:
               flushTextContentItem();
-              if (args[0].code) {
-                break;
-              }
               if (!xobjs) {
                 xobjs = resources.get('XObject') || _primitives.Dict.empty;
               }
@@ -18540,7 +18534,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         capHeight: descriptor.get('CapHeight'),
         flags: descriptor.get('Flags'),
         italicAngle: descriptor.get('ItalicAngle'),
-        coded: false
+        isType3Font: false
       };
       var cMapPromise;
       if (composite) {
@@ -39889,8 +39883,8 @@ exports.Type1Parser = Type1Parser;
 "use strict";
 
 
-var pdfjsVersion = '1.8.605';
-var pdfjsBuild = 'ace9de6f';
+var pdfjsVersion = '1.8.618';
+var pdfjsBuild = '21cc2c02';
 var pdfjsCoreWorker = __w_pdfjs_require__(17);
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
 

browser/extensions/pdfjs/content/web/viewer.js

@@ -537,101 +537,101 @@ var _ui_utils = __webpack_require__(0);
 
 function attachDOMEventsToEventBus(eventBus) {
   eventBus.on('documentload', function () {
-    var event = document.createEvent('CustomEvent');
+    let event = document.createEvent('CustomEvent');
     event.initCustomEvent('documentload', true, true, {});
     window.dispatchEvent(event);
   });
-  eventBus.on('pagerendered', function (e) {
-    var event = document.createEvent('CustomEvent');
+  eventBus.on('pagerendered', function (evt) {
+    let event = document.createEvent('CustomEvent');
     event.initCustomEvent('pagerendered', true, true, {
-      pageNumber: e.pageNumber,
-      cssTransform: e.cssTransform
+      pageNumber: evt.pageNumber,
+      cssTransform: evt.cssTransform
     });
-    e.source.div.dispatchEvent(event);
+    evt.source.div.dispatchEvent(event);
   });
-  eventBus.on('textlayerrendered', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('textlayerrendered', true, true, { pageNumber: e.pageNumber });
-    e.source.textLayerDiv.dispatchEvent(event);
+  eventBus.on('textlayerrendered', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('textlayerrendered', true, true, { pageNumber: evt.pageNumber });
+    evt.source.textLayerDiv.dispatchEvent(event);
   });
-  eventBus.on('pagechange', function (e) {
-    var event = document.createEvent('UIEvents');
+  eventBus.on('pagechange', function (evt) {
+    let event = document.createEvent('UIEvents');
     event.initUIEvent('pagechange', true, true, window, 0);
-    event.pageNumber = e.pageNumber;
-    e.source.container.dispatchEvent(event);
+    event.pageNumber = evt.pageNumber;
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('pagesinit', function (e) {
-    var event = document.createEvent('CustomEvent');
+  eventBus.on('pagesinit', function (evt) {
+    let event = document.createEvent('CustomEvent');
     event.initCustomEvent('pagesinit', true, true, null);
-    e.source.container.dispatchEvent(event);
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('pagesloaded', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('pagesloaded', true, true, { pagesCount: e.pagesCount });
-    e.source.container.dispatchEvent(event);
+  eventBus.on('pagesloaded', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('pagesloaded', true, true, { pagesCount: evt.pagesCount });
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('scalechange', function (e) {
-    var event = document.createEvent('UIEvents');
+  eventBus.on('scalechange', function (evt) {
+    let event = document.createEvent('UIEvents');
     event.initUIEvent('scalechange', true, true, window, 0);
-    event.scale = e.scale;
-    event.presetValue = e.presetValue;
-    e.source.container.dispatchEvent(event);
+    event.scale = evt.scale;
+    event.presetValue = evt.presetValue;
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('updateviewarea', function (e) {
-    var event = document.createEvent('UIEvents');
+  eventBus.on('updateviewarea', function (evt) {
+    let event = document.createEvent('UIEvents');
     event.initUIEvent('updateviewarea', true, true, window, 0);
-    event.location = e.location;
-    e.source.container.dispatchEvent(event);
+    event.location = evt.location;
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('find', function (e) {
-    if (e.source === window) {
+  eventBus.on('find', function (evt) {
+    if (evt.source === window) {
       return;
     }
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('find' + e.type, true, true, {
-      query: e.query,
-      phraseSearch: e.phraseSearch,
-      caseSensitive: e.caseSensitive,
-      highlightAll: e.highlightAll,
-      findPrevious: e.findPrevious
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('find' + evt.type, true, true, {
+      query: evt.query,
+      phraseSearch: evt.phraseSearch,
+      caseSensitive: evt.caseSensitive,
+      highlightAll: evt.highlightAll,
+      findPrevious: evt.findPrevious
     });
     window.dispatchEvent(event);
   });
-  eventBus.on('attachmentsloaded', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('attachmentsloaded', true, true, { attachmentsCount: e.attachmentsCount });
-    e.source.container.dispatchEvent(event);
+  eventBus.on('attachmentsloaded', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('attachmentsloaded', true, true, { attachmentsCount: evt.attachmentsCount });
+    evt.source.container.dispatchEvent(event);
   });
-  eventBus.on('sidebarviewchanged', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('sidebarviewchanged', true, true, { view: e.view });
-    e.source.outerContainer.dispatchEvent(event);
+  eventBus.on('sidebarviewchanged', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('sidebarviewchanged', true, true, { view: evt.view });
+    evt.source.outerContainer.dispatchEvent(event);
   });
-  eventBus.on('pagemode', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('pagemode', true, true, { mode: e.mode });
-    e.source.pdfViewer.container.dispatchEvent(event);
+  eventBus.on('pagemode', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('pagemode', true, true, { mode: evt.mode });
+    evt.source.pdfViewer.container.dispatchEvent(event);
   });
-  eventBus.on('namedaction', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('namedaction', true, true, { action: e.action });
-    e.source.pdfViewer.container.dispatchEvent(event);
+  eventBus.on('namedaction', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('namedaction', true, true, { action: evt.action });
+    evt.source.pdfViewer.container.dispatchEvent(event);
   });
-  eventBus.on('presentationmodechanged', function (e) {
-    var event = document.createEvent('CustomEvent');
+  eventBus.on('presentationmodechanged', function (evt) {
+    let event = document.createEvent('CustomEvent');
     event.initCustomEvent('presentationmodechanged', true, true, {
-      active: e.active,
-      switchInProgress: e.switchInProgress
+      active: evt.active,
+      switchInProgress: evt.switchInProgress
     });
     window.dispatchEvent(event);
   });
-  eventBus.on('outlineloaded', function (e) {
-    var event = document.createEvent('CustomEvent');
-    event.initCustomEvent('outlineloaded', true, true, { outlineCount: e.outlineCount });
-    e.source.container.dispatchEvent(event);
+  eventBus.on('outlineloaded', function (evt) {
+    let event = document.createEvent('CustomEvent');
+    event.initCustomEvent('outlineloaded', true, true, { outlineCount: evt.outlineCount });
+    evt.source.container.dispatchEvent(event);
   });
 }
-var globalEventBus = null;
+let globalEventBus = null;
 function getGlobalEventBus() {
   if (globalEventBus) {
     return globalEventBus;
@@ -2983,6 +2983,10 @@ class PDFFindController {
           }
           this.pageContents[i] = strBuf.join('');
           extractTextCapability.resolve(i);
+        }, reason => {
+          console.error(`Unable to get page ${i + 1} text content`, reason);
+          this.pageContents[i] = '';
+          extractTextCapability.resolve(i);
         });
       });
     }
@@ -4881,6 +4885,7 @@ class PDFPageView {
     let defaultViewport = options.defaultViewport;
     this.id = options.id;
     this.renderingId = 'page' + this.id;
+    this.pdfPage = null;
     this.pageLabel = null;
     this.rotation = 0;
     this.scale = options.scale || _ui_utils.DEFAULT_SCALE;
@@ -4925,6 +4930,7 @@ class PDFPageView {
     this.reset();
     if (this.pdfPage) {
       this.pdfPage.cleanup();
+      this.pdfPage = null;
     }
   }
   _resetZoomLayer(removeFromDOM = false) {
@@ -5103,6 +5109,10 @@ class PDFPageView {
       console.error('Must be in new state before drawing');
       this.reset();
     }
+    if (!this.pdfPage) {
+      this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+      return Promise.reject(new Error('Page is not loaded'));
+    }
     this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
     let pdfPage = this.pdfPage;
     let div = this.div;
@@ -6302,9 +6312,9 @@ class PDFThumbnailViewer {
     }
     this.pdfDocument = pdfDocument;
     if (!pdfDocument) {
-      return Promise.resolve();
+      return;
     }
-    return pdfDocument.getPage(1).then(firstPage => {
+    pdfDocument.getPage(1).then(firstPage => {
       let pagesCount = pdfDocument.numPages;
       let viewport = firstPage.getViewport(1.0);
       for (let pageNum = 1; pageNum <= pagesCount; ++pageNum) {
@@ -6319,6 +6329,8 @@ class PDFThumbnailViewer {
         });
         this._thumbnails.push(thumbnail);
       }
+    }).catch(reason => {
+      console.error('Unable to initialize thumbnail viewer', reason);
     });
   }
   _cancelRendering() {
@@ -6357,6 +6369,9 @@ class PDFThumbnailViewer {
       thumbView.setPdfPage(pdfPage);
       this._pagesRequests[pageNumber] = null;
       return pdfPage;
+    }).catch(reason => {
+      console.error('Unable to get page for thumb view', reason);
+      this._pagesRequests[pageNumber] = null;
     });
     this._pagesRequests[pageNumber] = promise;
     return promise;
@@ -6601,7 +6616,7 @@ class PDFViewer {
     };
     let firstPagePromise = pdfDocument.getPage(1);
     this.firstPagePromise = firstPagePromise;
-    return firstPagePromise.then(pdfPage => {
+    firstPagePromise.then(pdfPage => {
       let scale = this.currentScale;
       let viewport = pdfPage.getViewport(scale * _ui_utils.CSS_UNITS);
       for (let pageNum = 1; pageNum <= pagesCount; ++pageNum) {
@@ -6642,6 +6657,11 @@ class PDFViewer {
             if (--getPagesLeft === 0) {
               pagesCapability.resolve();
             }
+          }, reason => {
+            console.error(`Unable to get page ${pageNum} to initialize viewer`, reason);
+            if (--getPagesLeft === 0) {
+              pagesCapability.resolve();
+            }
           });
         }
       });
@@ -6652,6 +6672,8 @@ class PDFViewer {
       if (this.findController) {
         this.findController.resolveFirstPage();
       }
+    }).catch(reason => {
+      console.error('Unable to initialize viewer', reason);
     });
   }
   setPageLabels(labels) {
@@ -6979,6 +7001,9 @@ class PDFViewer {
       }
       this._pagesRequests[pageNumber] = null;
       return pdfPage;
+    }).catch(reason => {
+      console.error('Unable to get page for page view', reason);
+      this._pagesRequests[pageNumber] = null;
     });
     this._pagesRequests[pageNumber] = promise;
     return promise;

devtools/client/animationinspector/animation-controller.js

@@ -18,7 +18,7 @@ var { loader, require } = Cu.import("resource://devtools/shared/Loader.jsm", {})
 var { Task } = require("devtools/shared/task");
 
 loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/old-event-emitter");
 loader.lazyRequireGetter(this, "AnimationsFront", "devtools/shared/fronts/animation", true);
 
 const { LocalizationHelper } = require("devtools/shared/l10n");

devtools/client/animationinspector/components/animation-details.js

@@ -7,7 +7,7 @@
 "use strict";
 
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {createNode, getCssPropertyName} =
   require("devtools/client/animationinspector/utils");
 const {Keyframes} = require("devtools/client/animationinspector/components/keyframes");

devtools/client/animationinspector/components/animation-target-node.js

@@ -7,7 +7,7 @@
 "use strict";
 
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {DomNodePreview} = require("devtools/client/inspector/shared/dom-node-preview");
 
 // Map dom node fronts by animation fronts so we don't have to get them from the

devtools/client/animationinspector/components/animation-time-block.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {createNode, createSVGNode, TimeScale, getFormattedAnimationTitle} =
   require("devtools/client/animationinspector/utils");
 const {SummaryGraphHelper, getPreferredKeyframesProgressThreshold,

devtools/client/animationinspector/components/animation-timeline.js

@@ -7,7 +7,7 @@
 "use strict";
 
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {
   createNode,
   findOptimalTimeInterval,

devtools/client/animationinspector/components/keyframes.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {createNode, createSVGNode} =
   require("devtools/client/animationinspector/utils");
 const {ProgressGraphHelper, getPreferredKeyframesProgressThreshold} =

devtools/client/animationinspector/components/rate-selector.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {createNode} = require("devtools/client/animationinspector/utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const L10N =

devtools/client/animationinspector/utils.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/old-event-emitter");
 
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const L10N =

devtools/client/canvasdebugger/canvasdebugger.js

@@ -10,7 +10,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 const { SideMenuWidget } = require("resource://devtools/client/shared/widgets/SideMenuWidget.jsm");
 const promise = require("promise");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { CallWatcherFront } = require("devtools/shared/fronts/call-watcher");
 const { CanvasFront } = require("devtools/shared/fronts/canvas");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");

devtools/client/canvasdebugger/panel.js

@@ -7,7 +7,7 @@
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const promise = require("promise");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { CanvasFront } = require("devtools/shared/fronts/canvas");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 

devtools/client/debugger/debugger-controller.js

@@ -108,7 +108,7 @@ const { BreadcrumbsWidget } = require("resource://devtools/client/shared/widgets
 const { SideMenuWidget } = require("resource://devtools/client/shared/widgets/SideMenuWidget.jsm");
 const { VariablesView } = require("resource://devtools/client/shared/widgets/VariablesView.jsm");
 const { VariablesViewController, StackFrameUtils } = require("resource://devtools/client/shared/widgets/VariablesViewController.jsm");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { gDevTools } = require("devtools/client/framework/devtools");
 const { ViewHelpers, Heritage, WidgetMethods, setNamedTimeout,
         clearNamedTimeout } = require("devtools/client/shared/widgets/view-helpers");

devtools/client/debugger/panel.js

@@ -7,7 +7,7 @@
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const promise = require("promise");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 function DebuggerPanel(iframeWindow, toolbox) {

devtools/client/debugger/test/mochitest/head.js

@@ -18,7 +18,7 @@ var { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/
 var { DebuggerServer } = require("devtools/server/main");
 var { DebuggerClient, ObjectClient } = require("devtools/shared/client/main");
 var { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 
 const chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);

devtools/client/dom/dom-panel.js

@@ -9,7 +9,7 @@ const { Cu } = require("chrome");
 const { ObjectClient } = require("devtools/shared/client/main");
 
 const defer = require("devtools/shared/defer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { Task } = require("devtools/shared/task");
 
 /**

devtools/client/framework/ToolboxProcess.jsm

@@ -19,7 +19,7 @@ XPCOMUtils.defineLazyGetter(this, "Telemetry", function () {
   return require("devtools/client/shared/telemetry");
 });
 XPCOMUtils.defineLazyGetter(this, "EventEmitter", function () {
-  return require("devtools/shared/event-emitter");
+  return require("devtools/shared/old-event-emitter");
 });
 const promise = require("promise");
 const Services = require("Services");

devtools/client/framework/devtools.js

@@ -24,7 +24,7 @@ loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/f
 
 const {defaultTools: DefaultTools, defaultThemes: DefaultThemes} =
   require("devtools/client/definitions");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const AboutDevTools = require("devtools/client/framework/about-devtools-toolbox");
 const {Task} = require("devtools/shared/task");
 const {getTheme, setTheme, addThemeObserver, removeThemeObserver} =

devtools/client/framework/menu.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 /**
  * A partial implementation of the Menu API provided by electron:

devtools/client/framework/selection.js

@@ -7,7 +7,7 @@
 "use strict";
 
 const nodeConstants = require("devtools/shared/dom-node-constants");
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 
 /**
  * API

devtools/client/framework/sidebar.js

@@ -6,7 +6,7 @@
 
 var Services = require("Services");
 var {Task} = require("devtools/shared/task");
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");
 
 const {LocalizationHelper} = require("devtools/shared/l10n");

devtools/client/framework/target.js

@@ -6,7 +6,7 @@
 
 const { Ci } = require("chrome");
 const defer = require("devtools/shared/defer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const Services = require("Services");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 

devtools/client/framework/test/head.js

@@ -8,7 +8,7 @@
 // shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 function toggleAllTools(state) {
   for (let [, tool] of gDevTools._tools) {

devtools/client/framework/toolbox-hosts.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const Services = require("Services");

devtools/client/framework/toolbox-options.js

@@ -71,7 +71,7 @@ function OptionsPanel(iframeWindow, toolbox) {
 
   this._addListeners();
 
-  const EventEmitter = require("devtools/shared/event-emitter");
+  const EventEmitter = require("devtools/shared/old-event-emitter");
   EventEmitter.decorate(this);
 }
 

devtools/client/framework/toolbox.js

@@ -20,7 +20,7 @@ var defer = require("devtools/shared/defer");
 var Services = require("Services");
 var {Task} = require("devtools/shared/task");
 var {gDevTools} = require("devtools/client/framework/devtools");
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");
 var { attachThread, detachThread } = require("./attach-thread");
 var Menu = require("devtools/client/framework/menu");

devtools/client/inspector/breadcrumbs.js

@@ -15,7 +15,7 @@ const MAX_LABEL_LENGTH = 40;
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const SCROLL_REPEAT_MS = 100;
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 
 // Some margin may be required for visible element detection.

devtools/client/inspector/inspector-search.js

@@ -8,7 +8,7 @@ const promise = require("promise");
 const {Task} = require("devtools/shared/task");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const AutocompletePopup = require("devtools/client/shared/autocomplete-popup");
 const Services = require("Services");
 

devtools/client/inspector/inspector.js

@@ -10,7 +10,7 @@
 
 var Services = require("Services");
 var promise = require("promise");
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 const {executeSoon} = require("devtools/shared/DevToolsUtils");
 var KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 var {Task} = require("devtools/shared/task");

devtools/client/inspector/markup/markup.js

@@ -9,7 +9,7 @@ const Services = require("Services");
 const {Task} = require("devtools/shared/task");
 const nodeConstants = require("devtools/shared/dom-node-constants");
 const nodeFilterConstants = require("devtools/shared/dom-node-filter-constants");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const {PluralForm} = require("devtools/shared/plural-form");
 const AutocompletePopup = require("devtools/client/shared/autocomplete-popup");

devtools/client/inspector/markup/views/html-editor.js

@@ -6,7 +6,7 @@
 
 const Editor = require("devtools/client/sourceeditor/editor");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 /**
  * A wrapper around the Editor component, that allows editing of HTML.

devtools/client/inspector/rules/rules.js

@@ -31,7 +31,7 @@ const {
 const StyleInspectorMenu = require("devtools/client/inspector/shared/style-inspector-menu");
 const TooltipsOverlay = require("devtools/client/inspector/shared/tooltips-overlay");
 const {createChild, promiseWarn, debounce} = require("devtools/client/inspector/shared/utils");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 const clipboardHelper = require("devtools/shared/platform/clipboard");
 const AutocompletePopup = require("devtools/client/shared/autocomplete-popup");

devtools/client/inspector/rules/views/class-list-previewer.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 
 const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

devtools/client/inspector/rules/views/rule-editor.js

@@ -25,7 +25,7 @@ const {
 } = require("devtools/shared/css/parsing-utils");
 const promise = require("promise");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {Task} = require("devtools/shared/task");
 
 const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties";

devtools/client/inspector/shared/dom-node-preview.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {createNode} = require("devtools/client/animationinspector/utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 

devtools/client/inspector/shared/highlighters-overlay.js

@@ -8,7 +8,7 @@
 
 const Services = require("Services");
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {
   VIEW_NODE_VALUE_TYPE,
   VIEW_NODE_SHAPE_POINT_TYPE

devtools/client/inspector/toolsidebar.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");
 var { Task } = require("devtools/shared/task");
 

devtools/client/memory/components/tree-map/canvas-utils.js

@@ -16,7 +16,7 @@
  * in view of the tree map.
  */
 const { debounce } = require("devtools/shared/debounce");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const FULLSCREEN_STYLE = {

devtools/client/memory/components/tree-map/drag-zoom.js

@@ -6,7 +6,7 @@
 
 const { debounce } = require("devtools/shared/debounce");
 const { lerp } = require("devtools/client/memory/utils");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 const LERP_SPEED = 0.5;
 const ZOOM_SPEED = 0.01;

devtools/client/memory/panel.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const { Task } = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { MemoryFront } = require("devtools/shared/fronts/memory");
 const HeapAnalysesClient = require("devtools/shared/heapsnapshot/HeapAnalysesClient");
 

devtools/client/netmonitor/index.html

@@ -20,7 +20,7 @@
         window,
       }).require;
 
-      const EventEmitter = require("devtools/shared/event-emitter");
+      const EventEmitter = require("devtools/shared/old-event-emitter");
       const { createFactory } = require("devtools/client/shared/vendor/react");
       const { render, unmountComponentAtNode } = require("devtools/client/shared/vendor/react-dom");
       const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);

devtools/client/netmonitor/webpack.config.js

@@ -74,7 +74,7 @@ let webpackConfig = {
       "devtools/client/sourceeditor/editor": "devtools-source-editor/src/source-editor",
       "devtools/shared/async-utils": path.join(__dirname, "../../shared/async-utils"),
       "devtools/shared/defer": path.join(__dirname, "../../shared/defer"),
-      "devtools/shared/event-emitter": "devtools-modules/src/utils/event-emitter",
+      "devtools/shared/old-event-emitter": "devtools-modules/src/utils/event-emitter",
       "devtools/shared/fronts/timeline": path.join(__dirname, "../../shared/shims/fronts/timeline"),
       "devtools/shared/l10n": path.join(__dirname, "../../shared/l10n"),
       "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),

devtools/client/performance/modules/widgets/graphs.js

@@ -14,7 +14,7 @@ const MountainGraphWidget = require("devtools/client/shared/widgets/MountainGrap
 const { CanvasGraphUtils } = require("devtools/client/shared/widgets/Graphs");
 
 const defer = require("devtools/shared/defer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 const { colorUtils } = require("devtools/shared/css/color");
 const { getColor } = require("devtools/client/shared/theme");

devtools/client/performance/modules/widgets/marker-details.js

@@ -7,7 +7,7 @@
  * This file contains the rendering code for the marker sidebar.
  */
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { MarkerDOMUtils } = require("devtools/client/performance/modules/marker-dom-utils");
 
 /**

devtools/client/performance/panel.js

@@ -9,7 +9,7 @@ const { Task } = require("devtools/shared/task");
 const defer = require("devtools/shared/defer");
 
 loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/shared/event-emitter");
+  "devtools/shared/old-event-emitter");
 
 function PerformancePanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;

devtools/client/performance/performance-controller.js

@@ -41,7 +41,7 @@ var RecordingListItem = React.createFactory(require("devtools/client/performance
 var Services = require("Services");
 var promise = require("promise");
 const defer = require("devtools/shared/defer");
-var EventEmitter = require("devtools/shared/event-emitter");
+var EventEmitter = require("devtools/shared/old-event-emitter");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var flags = require("devtools/shared/flags");
 var system = require("devtools/shared/system");

devtools/client/responsive.html/manager.js

@@ -7,7 +7,7 @@
 const { Ci } = require("chrome");
 const promise = require("promise");
 const { Task } = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { startup } = require("./utils/window");
 const message = require("./utils/message");
 const { swapToInnerBrowser } = require("./browser/swap");

devtools/client/responsivedesign/responsivedesign.jsm

@@ -10,7 +10,7 @@ const { loader, require } = Cu.import("resource://devtools/shared/Loader.jsm", {
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const { Task } = require("devtools/shared/task");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 loader.lazyImporter(this, "SystemAppProxy",
                     "resource://gre/modules/SystemAppProxy.jsm");

devtools/client/scratchpad/scratchpad-panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const {Cu} = require("chrome");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 

devtools/client/scratchpad/scratchpad.js

@@ -47,7 +47,7 @@ const {require, loader} = Cu.import("resource://devtools/shared/Loader.jsm", {})
 
 const Editor = require("devtools/client/sourceeditor/editor");
 const TargetFactory = require("devtools/client/framework/target").TargetFactory;
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {DevToolsWorker} = require("devtools/shared/worker/worker");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const flags = require("devtools/shared/flags");

devtools/client/shadereditor/panel.js

@@ -7,7 +7,7 @@
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const promise = require("promise");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { WebGLFront } = require("devtools/shared/fronts/webgl");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 

devtools/client/shadereditor/shadereditor.js

@@ -11,7 +11,7 @@ const {SideMenuWidget} = require("resource://devtools/client/shared/widgets/Side
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const Tooltip = require("devtools/client/shared/widgets/tooltip/Tooltip");
 const Editor = require("devtools/client/sourceeditor/editor");
 const {LocalizationHelper} = require("devtools/shared/l10n");

devtools/client/shared/autocomplete-popup.js

@@ -8,7 +8,7 @@
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const Services = require("Services");
 const {HTMLTooltip} = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {PrefObserver} = require("devtools/client/shared/prefs");
 
 let itemIdCounter = 0;

devtools/client/shared/developer-toolbar.js

@@ -29,7 +29,7 @@ loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
 loader.lazyRequireGetter(this, "nodeConstants", "devtools/shared/dom-node-constants");
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/old-event-emitter");
 
 /**
  * A collection of utilities to help working with commands

devtools/client/shared/devtools-file-watcher.js

@@ -5,7 +5,7 @@
 
 const { Ci } = require("chrome");
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 loader.lazyImporter(this, "OS", "resource://gre/modules/osfile.jsm");
 

devtools/client/shared/inplace-editor.js

@@ -42,7 +42,7 @@ const MAX_POPUP_ENTRIES = 500;
 const FOCUS_FORWARD = focusManager.MOVEFOCUS_FORWARD;
 const FOCUS_BACKWARD = focusManager.MOVEFOCUS_BACKWARD;
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { findMostRelevantCssPropertyIndex } = require("./suggestion-picker");
 
 /**

devtools/client/shared/key-shortcuts.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const isOSX = Services.appinfo.OS === "Darwin";
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 

devtools/client/shared/options-view.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const Services = require("Services");
 const { Preferences } = require("resource://gre/modules/Preferences.jsm");
 const OPTIONS_SHOWN_EVENT = "options-shown";

devtools/client/shared/output-parser.js

@@ -7,7 +7,7 @@
 const {angleUtils} = require("devtools/client/shared/css-angle");
 const {colorUtils} = require("devtools/shared/css/color");
 const {getCSSLexer} = require("devtools/shared/css/lexer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {
   ANGLE_TAKING_FUNCTIONS,
   BASIC_SHAPE_FUNCTIONS,

devtools/client/shared/prefs.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const Services = require("Services");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 /**
  * Shortcuts for lazily accessing and setting various preferences.

devtools/client/shared/widgets/AbstractTreeItem.jsm

@@ -12,7 +12,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
 const { KeyCodes } = require("devtools/client/shared/keycodes");
 
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/old-event-emitter");
 
 XPCOMUtils.defineLazyModuleGetter(this, "console",
   "resource://gre/modules/Console.jsm");

devtools/client/shared/widgets/BreadcrumbsWidget.jsm

@@ -11,7 +11,7 @@ const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms
 
 const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const { ViewHelpers, setNamedTimeout } = require("devtools/client/shared/widgets/view-helpers");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 this.EXPORTED_SYMBOLS = ["BreadcrumbsWidget"];
 

devtools/client/shared/widgets/Chart.js

@@ -12,7 +12,7 @@ const NAMED_SLICE_MIN_ANGLE = TAU / 8;
 const NAMED_SLICE_TEXT_DISTANCE_RATIO = 1.9;
 const HOVERED_SLICE_TRANSLATE_DISTANCE_RATIO = 20;
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper(NET_STRINGS_URI);
 

devtools/client/shared/widgets/ColorWidget.js

@@ -10,7 +10,7 @@
 "use strict";
 
 const {Task} = require("devtools/shared/task");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {colorUtils} = require("devtools/shared/css/color");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

devtools/client/shared/widgets/CubicBezierWidget.js

@@ -25,7 +25,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {
   PREDEFINED,
   PRESETS,

devtools/client/shared/widgets/FastListWidget.js

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
 
 /**

devtools/client/shared/widgets/FilterWidget.js

@@ -9,7 +9,7 @@
   * for Rule View's filter swatches
   */
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { Cc, Ci } = require("chrome");
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 

devtools/client/shared/widgets/FlameGraph.js

@@ -9,7 +9,7 @@ const { ELLIPSIS } = require("devtools/shared/l10n");
 
 loader.lazyRequireGetter(this, "defer", "devtools/shared/defer");
 loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/shared/event-emitter");
+  "devtools/shared/old-event-emitter");
 
 loader.lazyRequireGetter(this, "getColor",
   "devtools/client/shared/theme", true);

devtools/client/shared/widgets/Graphs.js

@@ -9,7 +9,7 @@ const { getCurrentZoom } = require("devtools/shared/layout/utils");
 
 loader.lazyRequireGetter(this, "defer", "devtools/shared/defer");
 loader.lazyRequireGetter(this, "EventEmitter",
-  "devtools/shared/event-emitter");
+  "devtools/shared/old-event-emitter");
 
 loader.lazyImporter(this, "DevToolsWorker",
   "resource://devtools/shared/worker/worker.js");

devtools/client/shared/widgets/MdnDocsWidget.js

@@ -27,7 +27,7 @@
 const Services = require("Services");
 const defer = require("devtools/shared/defer");
 const {getCSSLexer} = require("devtools/shared/css/lexer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {gDevTools} = require("devtools/client/framework/devtools");
 
 const {LocalizationHelper} = require("devtools/shared/l10n");

devtools/client/shared/widgets/SideMenuWidget.jsm

@@ -11,7 +11,7 @@ const Cu = Components.utils;
 const SHARED_STRINGS_URI = "devtools/client/locales/shared.properties";
 
 const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");
 

devtools/client/shared/widgets/Spectrum.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
 /**

devtools/client/shared/widgets/TableWidget.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 loader.lazyRequireGetter(this, "setNamedTimeout",
   "devtools/client/shared/widgets/view-helpers", true);
 loader.lazyRequireGetter(this, "clearNamedTimeout",

devtools/client/shared/widgets/TreeWidget.js

@@ -7,7 +7,7 @@
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 
 /**

devtools/client/shared/widgets/VariablesView.jsm

@@ -18,7 +18,7 @@ const ITEM_FLASH_DURATION = 300; // ms
 
 const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const Services = require("Services");
 const { getSourceNames } = require("devtools/client/shared/source-utils");

devtools/client/shared/widgets/tooltip/HTMLTooltip.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {TooltipToggle} = require("devtools/client/shared/widgets/tooltip/TooltipToggle");
 const {listenOnce} = require("devtools/shared/async-utils");
 const {Task} = require("devtools/shared/task");

devtools/client/shared/widgets/tooltip/InlineTooltip.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 
 /**
  * The InlineTooltip can display widgets for the CSS Rules view in an

devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 const {HTMLTooltip} = require("devtools/client/shared/widgets/tooltip/HTMLTooltip");
 const InlineTooltip = require("devtools/client/shared/widgets/tooltip/InlineTooltip");

devtools/client/shared/widgets/tooltip/Tooltip.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const defer = require("devtools/shared/defer");
-const EventEmitter = require("devtools/shared/event-emitter");
+const EventEmitter = require("devtools/shared/old-event-emitter");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 const {TooltipToggle} = require("devtools/client/shared/widgets/tooltip/TooltipToggle");