diff -r 000000000000 -r 6474c204b198 toolkit/modules/RemoteWebProgress.jsm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/modules/RemoteWebProgress.jsm	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,200 @@
+// -*- Mode: javascript; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+this.EXPORTED_SYMBOLS = ["RemoteWebProgressManager"];
+
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function newURI(spec)
+{
+    return Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService)
+                                                    .newURI(spec, null, null);
+}
+
+function RemoteWebProgressRequest(spec)
+{
+  this.uri = newURI(spec);
+}
+
+RemoteWebProgressRequest.prototype = {
+  QueryInterface : XPCOMUtils.generateQI([Ci.nsIChannel]),
+
+  get URI() { return this.uri.clone(); }
+};
+
+function RemoteWebProgress(aManager, aIsTopLevel) {
+  this._manager = aManager;
+
+  this._isLoadingDocument = false;
+  this._DOMWindow = null;
+  this._isTopLevel = aIsTopLevel;
+  this._loadType = 0;
+}
+
+RemoteWebProgress.prototype = {
+  NOTIFY_STATE_REQUEST:  0x00000001,
+  NOTIFY_STATE_DOCUMENT: 0x00000002,
+  NOTIFY_STATE_NETWORK:  0x00000004,
+  NOTIFY_STATE_WINDOW:   0x00000008,
+  NOTIFY_STATE_ALL:      0x0000000f,
+  NOTIFY_PROGRESS:       0x00000010,
+  NOTIFY_STATUS:         0x00000020,
+  NOTIFY_SECURITY:       0x00000040,
+  NOTIFY_LOCATION:       0x00000080,
+  NOTIFY_REFRESH:        0x00000100,
+  NOTIFY_ALL:            0x000001ff,
+
+  get isLoadingDocument() { return this._isLoadingDocument },
+  get DOMWindow() { return this._DOMWindow; },
+  get DOMWindowID() { return 0; },
+  get isTopLevel() { return this._isTopLevel },
+  get loadType() { return this._loadType; },
+
+  addProgressListener: function (aListener) {
+    this._manager.addProgressListener(aListener);
+  },
+
+  removeProgressListener: function (aListener) {
+    this._manager.removeProgressListener(aListener);
+  }
+};
+
+function RemoteWebProgressManager (aBrowser) {
+  this._browser = aBrowser;
+  this._topLevelWebProgress = new RemoteWebProgress(this, true);
+  this._progressListeners = [];
+
+  this._browser.messageManager.addMessageListener("Content:StateChange", this);
+  this._browser.messageManager.addMessageListener("Content:LocationChange", this);
+  this._browser.messageManager.addMessageListener("Content:SecurityChange", this);
+  this._browser.messageManager.addMessageListener("Content:StatusChange", this);
+}
+
+RemoteWebProgressManager.prototype = {
+  get topLevelWebProgress() {
+    return this._topLevelWebProgress;
+  },
+
+  addProgressListener: function (aListener) {
+    let listener = aListener.QueryInterface(Ci.nsIWebProgressListener);
+    this._progressListeners.push(listener);
+  },
+
+  removeProgressListener: function (aListener) {
+    this._progressListeners =
+      this._progressListeners.filter(l => l != aListener);
+  },
+
+  _fixSSLStatusAndState: function (aStatus, aState) {
+    let deserialized = null;
+    if (aStatus) {
+      let helper = Cc["@mozilla.org/network/serialization-helper;1"]
+                    .getService(Components.interfaces.nsISerializationHelper);
+
+      deserialized = helper.deserializeObject(aStatus)
+      deserialized.QueryInterface(Ci.nsISSLStatus);
+    }
+
+    // We must check the Extended Validation (EV) state here, on the chrome
+    // process, because NSS is needed for that determination.
+    if (deserialized && deserialized.isExtendedValidation)
+      aState |= Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL;
+
+    return [deserialized, aState];
+  },
+
+  setCurrentURI: function (aURI) {
+    // This function is simpler than nsDocShell::SetCurrentURI since
+    // it doesn't have to deal with child docshells.
+    let webNavigation = this._browser.webNavigation;
+    webNavigation._currentURI = aURI;
+
+    let webProgress = this.topLevelWebProgress;
+    for (let p of this._progressListeners) {
+      p.onLocationChange(webProgress, null, aURI);
+    }
+  },
+
+  _callProgressListeners: function(methodName, ...args) {
+    for (let p of this._progressListeners) {
+      if (p[methodName]) {
+        try {
+          p[methodName].apply(p, args);
+        } catch (ex) {
+          Cu.reportError("RemoteWebProgress failed to call " + methodName + ": " + ex + "\n");
+        }
+      }
+    }
+  },
+
+  receiveMessage: function (aMessage) {
+    let json = aMessage.json;
+    let objects = aMessage.objects;
+
+    // The top-level WebProgress is always the same, but because we don't
+    // really have a concept of subframes/content we always creat a new object
+    // for those.
+    let webProgress = json.isTopLevel ? this._topLevelWebProgress
+                                      : new RemoteWebProgress(this, false);
+
+    // The WebProgressRequest object however is always dynamic.
+    let request = json.requestURI ? new RemoteWebProgressRequest(json.requestURI)
+                                  : null;
+
+    // Update the actual WebProgress fields.
+    webProgress._isLoadingDocument = json.isLoadingDocument;
+    webProgress._DOMWindow = objects.DOMWindow;
+    webProgress._loadType = json.loadType;
+
+    if (json.isTopLevel) {
+      this._browser._contentWindow = objects.contentWindow;
+      this._browser._documentContentType = json.documentContentType;
+    }
+
+    switch (aMessage.name) {
+    case "Content:StateChange":
+      this._callProgressListeners("onStateChange", webProgress, request, json.stateFlags, json.status);
+      break;
+
+    case "Content:LocationChange":
+      let location = newURI(json.location);
+      let flags = json.flags;
+
+      if (json.isTopLevel) {
+        this._browser.webNavigation._currentURI = location;
+        this._browser.webNavigation.canGoBack = json.canGoBack;
+        this._browser.webNavigation.canGoForward = json.canGoForward;
+        this._browser._characterSet = json.charset;
+        this._browser._documentURI = newURI(json.documentURI);
+        this._browser._imageDocument = null;
+      }
+
+      this._callProgressListeners("onLocationChange", webProgress, request, location, flags);
+      break;
+
+    case "Content:SecurityChange":
+      let [status, state] = this._fixSSLStatusAndState(json.status, json.state);
+
+      if (json.isTopLevel) {
+        // Invoking this getter triggers the generation of the underlying object,
+        // which we need to access with ._securityUI, because .securityUI returns
+        // a wrapper that makes _update inaccessible.
+        void this._browser.securityUI;
+        this._browser._securityUI._update(status, state);
+      }
+
+      this._callProgressListeners("onSecurityChange", webProgress, request, state);
+      break;
+
+    case "Content:StatusChange":
+      this._callProgressListeners("onStatusChange", webProgress, request, json.status, json.message);
+      break;
+    }
+  }
+};