Bug 1331601 - Restore remoteType on RDM close. r=ochameau
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 18 Jan 2017 17:06:55 -0600
changeset 375310 48136ce8a357144b3d9af7f7075a41569a94b865
parent 375309 d01f82be01f1ffe1399d5161d6c036d94afbe527
child 375311 0de2f57ed353e10176053d1e83f95d42f031c1be
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1331601, 1318767
milestone53.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
Bug 1331601 - Restore remoteType on RDM close. r=ochameau In bug 1318767, `updateBrowserRemoteness` was changed to take the `remoteType` as part of an options argument, but the RDM call site wasn't updated. MozReview-Commit-ID: 8GSSwicaHvz
devtools/client/responsive.html/browser/swap.js
--- a/devtools/client/responsive.html/browser/swap.js
+++ b/devtools/client/responsive.html/browser/swap.js
@@ -145,18 +145,19 @@ function swapToInnerBrowser({ tab, conta
       //    `gBrowser._swapBrowserDocShells`.
       dispatchDevToolsBrowserSwap(innerBrowser, contentBrowser);
       gBrowser._swapBrowserDocShells(contentTab, innerBrowser);
       innerBrowser = null;
 
       // 5. Force the original browser tab to be remote since web content is
       //    loaded in the child process, and we're about to swap the content
       //    into this tab.
-      gBrowser.updateBrowserRemoteness(tab.linkedBrowser, true,
-                                       contentBrowser.remoteType);
+      gBrowser.updateBrowserRemoteness(tab.linkedBrowser, true, {
+        remoteType: contentBrowser.remoteType,
+      });
 
       // 6. Swap the content into the original browser tab and close the
       //    temporary tab used to hold the content via
       //    `swapBrowsersAndCloseOther`.
       dispatchDevToolsBrowserSwap(contentBrowser, tab.linkedBrowser);
       gBrowser.swapBrowsersAndCloseOther(tab, contentTab);
 
       // Swapping browsers disconnects the find bar UI from the browser.