From 70d5eceb33fb77bdd7cf92e08772c8e361ff799d Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Feb 2017 12:11:04 +0100 Subject: [PATCH] Backed out changeset 59d4978e8726 (bug 1289723) for eslint failure --- .../components/sessionstore/test/browser_crashedTabs.js | 7 ++++--- toolkit/content/widgets/remote-browser.xml | 8 ++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/browser/components/sessionstore/test/browser_crashedTabs.js b/browser/components/sessionstore/test/browser_crashedTabs.js index 193f9b16d535..b97bc91e761a 100644 --- a/browser/components/sessionstore/test/browser_crashedTabs.js +++ b/browser/components/sessionstore/test/browser_crashedTabs.js @@ -13,6 +13,7 @@ const PAGE_2 = "data:text/html,Another%20regular,%20everyday,%20norm add_task(function* test_initialize() { yield SpecialPowers.pushPrefEnv({ set: [ + [ "dom.ipc.processCount", 1 ], [ "browser.tabs.animate", false] ] }); }); @@ -240,7 +241,7 @@ add_task(function* test_revive_tab_from_session_store() { browser.loadURI(PAGE_1); yield promiseBrowserLoaded(browser); - let newTab2 = gBrowser.addTab("about:blank", { sameProcessAsFrameLoader: browser.frameLoader }); + let newTab2 = gBrowser.addTab(); let browser2 = newTab2.linkedBrowser; ok(browser2.isRemoteBrowser, "Should be a remote browser"); yield promiseBrowserLoaded(browser2); @@ -297,7 +298,7 @@ add_task(function* test_revive_all_tabs_from_session_store() { // a second window, since only selected tabs will show // about:tabcrashed. let win2 = yield BrowserTestUtils.openNewBrowserWindow(); - let newTab2 = win2.gBrowser.addTab(PAGE_1, { sameProcessAsFrameLoader: browser.frameLoader }); + let newTab2 = win2.gBrowser.addTab(PAGE_1); win2.gBrowser.selectedTab = newTab2; let browser2 = newTab2.linkedBrowser; ok(browser2.isRemoteBrowser, "Should be a remote browser"); @@ -404,7 +405,7 @@ add_task(function* test_hide_restore_all_button() { // Load up a second window so we can get another tab to show // about:tabcrashed let win2 = yield BrowserTestUtils.openNewBrowserWindow(); - let newTab3 = win2.gBrowser.addTab(PAGE_2, { sameProcessAsFrameLoader: browser.frameLoader }); + let newTab3 = win2.gBrowser.addTab(PAGE_2); win2.gBrowser.selectedTab = newTab3; let otherWinBrowser = newTab3.linkedBrowser; yield promiseBrowserLoaded(otherWinBrowser); diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml index 141dba945476..0dde870a5278 100644 --- a/toolkit/content/widgets/remote-browser.xml +++ b/toolkit/content/widgets/remote-browser.xml @@ -190,9 +190,7 @@ let changed = val.toFixed(2) != this._fullZoom.toFixed(2); this._fullZoom = val; - try { - this.messageManager.sendAsyncMessage("FullZoom", {value: val}); - } catch(ex) {} + this.messageManager.sendAsyncMessage("FullZoom", {value: val}); if (changed) { let event = new Event("FullZoomChange", {bubbles: true}); @@ -210,9 +208,7 @@ let changed = val.toFixed(2) != this._textZoom.toFixed(2); this._textZoom = val; - try { - this.messageManager.sendAsyncMessage("TextZoom", {value: val}); - } catch(ex) {} + this.messageManager.sendAsyncMessage("TextZoom", {value: val}); if (changed) { let event = new Event("TextZoomChange", {bubbles: true});