author | Tim Taubert <ttaubert@mozilla.com> |
Tue, 09 Jun 2015 08:59:44 +0200 | |
changeset 248062 | 87dc1d71af519503441f65d2f9563f8d2e6c7953 |
parent 248061 | 05586e36413f73e998dd172f8d82a0faf1017027 |
child 248063 | 5097e037c4b0de532f2e8571e2a05d8335108f5f |
push id | 60888 |
push user | kwierso@gmail.com |
push date | Thu, 11 Jun 2015 01:38:38 +0000 |
treeherder | mozilla-inbound@39e638ed06bf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mconley |
bugs | 1172137 |
milestone | 41.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -1489,16 +1489,19 @@ <body> <![CDATA[ let isRemote = aBrowser.getAttribute("remote") == "true"; if (isRemote == aShouldBeRemote) return false; let wasActive = document.activeElement == aBrowser; + // Unmap the old outerWindowID. + this._outerWindowIDBrowserMap.delete(aBrowser.outerWindowID); + // Unhook our progress listener. let tab = this.getTabForBrowser(aBrowser); let index = tab._tPos; let filter = this.mTabFilters[index]; aBrowser.webProgress.removeProgressListener(filter); // Make sure the browser is destroyed so it unregisters from observer notifications aBrowser.destroy(); @@ -1520,16 +1523,19 @@ if (aShouldBeRemote) { // Switching the browser to be remote will connect to a new child // process so the browser can no longer be considered to be // crashed. tab.removeAttribute("crashed"); } else { aBrowser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned }) + + // Register the new outerWindowID. + this._outerWindowIDBrowserMap.set(aBrowser.outerWindowID, aBrowser); } if (wasActive) aBrowser.focus(); let evt = document.createEvent("Events"); evt.initEvent("TabRemotenessChange", true, false); tab.dispatchEvent(evt);