Issue 3748 - Update URL Fixer dependency on buildtools to revision c92cc4e4a338 and make it E10S-co…

lib/child/typoNetError.js

 /*
  * This file is part of the URL Fixer,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * URL Fixer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * URL Fixer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
       this.shutdownHandlers.splice(index, 1);
   }
 };
 
 let netErrorOverlay = null;
 
 function receivedNetErrorOverlay(message)
 {
   let parser = Cc["@mozilla.org/xmlextras/domparser;1"]
                  .createInstance(Ci.nsIDOMParser);
   netErrorOverlay = parser.parseFromString(message.data, "application/xml");

[Thomas Greiner, 2016/03/08 12:34:43]

Note that previously we were first loading the error overlay and then installing
the `WindowObserver` which installed the "DOMContentLoaded" listener. Now,
however, we're installing the "DOMContentLoaded" listener in parallel to
requesting the error overlay.

[Wladimir Palant, 2016/03/08 14:37:48]

Yes. There is a check for netErrorOverlay in the event handler so doing this
sequentially is unnecessary.

 }
 
 function shutdown(message)
 {
   if (message.data == Components.stack.filename && !onShutdown.done)
   {
     onShutdown.done = true;
     for (let i = onShutdown.shutdownHandlers.length - 1; i >= 0; i --)
     {
       try
       {
         onShutdown.shutdownHandlers[i]();
       }
       catch (e)
       {
         Cu.reportError(e);
       }
     }
     onShutdown.shutdownHandlers = null;
   }
 }
 
 function onDocumentCreated(subject, topic, data)
 {
   if (topic != "content-document-global-created")

[Thomas Greiner, 2016/03/08 12:34:44]

Detail: Is this check necessary given that you've already specified in line 134
that you're only listening to "content-document-global-created"?

[Wladimir Palant, 2016/03/08 14:37:48]

It's a somewhat theoretical scenario but some misguided extension could be
calling observers directly (e.g. after obtaining a list via
nsIObserverService.enumerateObservers()) - and they might be calling with a
different topic because the observer they mean to trigger isn't ours at all.
Yes, those things happen...

     return;
   if (!(subject instanceof Ci.nsIDOMWindow))
     return;
 
   subject.addEventListener("DOMContentLoaded", handlePageLoad);

[Thomas Greiner, 2016/03/08 12:34:43]

Detail: We usually explicitly specify the "useCapture" argument.

[Wladimir Palant, 2016/03/08 14:37:48]

Well, we can stop doing that - it's optional ever since Firefox 6.

 }
 
 function handlePageLoad(event)
 {
   let document = event.target;
   if (document.documentURI.indexOf("about:neterror?") != 0 ||
       document.documentURI.indexOf("e=netOffline") > 0 ||
       document.documentURI.indexOf("e=notCached") > 0)
   {
     return;
@@ skipping 30 matching lines @@
 function parseURL(url)
 {
   if (/^\s*((?:\w+:)?\/*(?:[^\/#]*@)?)([^\/:#]*)/.test(url))
     return [RegExp.$1, RegExp.$2.toLowerCase(), RegExp.rightContext];
   else
     return [url, null, null];
 }
 
 addMessageListener("URLFixer:NetErrorOverlay", receivedNetErrorOverlay);
 addMessageListener("URLFixer:Shutdown", shutdown);
-onShutdown.add(() => {
+onShutdown.add(() =>
+{
   removeMessageListener("URLFixer:NetErrorOverlay", receivedNetErrorOverlay);
   removeMessageListener("URLFixer:Shutdown", shutdown);
 });
 sendAsyncMessage("URLFixer:GetNetErrorOverlay");
 
 Services.obs.addObserver(onDocumentCreated, "content-document-global-created", false);
-onShutdown.add(() => {
+onShutdown.add(() =>
+{
   Services.obs.removeObserver(onDocumentCreated, "content-document-global-created");
 });