From b67d0c309e3058aaac37a20cdb74528ea2d6722c Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Mon, 14 Jan 2019 15:24:54 +0000 Subject: [PATCH] Bug 1478358 - [marionette] Don't wait for resize events in "Set Window Rect". r=ato Differential Revision: https://phabricator.services.mozilla.com/D16338 --HG-- extra : moz-landing-system : lando --- testing/marionette/driver.js | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js index f3d0e4a29c1d..72a4a645ab44 100644 --- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -1455,27 +1455,14 @@ GeckoDriver.prototype.setWindowRect = async function(cmd) { break; } - if (height != null && width != null) { + if (width != null && height != null) { assert.positiveInteger(height); assert.positiveInteger(width); - let debounce = new DebounceCallback(() => { - win.dispatchEvent(new win.CustomEvent("resizeEnd")); - }); - - await new TimedPromise(async resolve => { - if (win.outerWidth == width && win.outerHeight == height) { - resolve(); - return; - } - - win.addEventListener("resize", debounce); - win.addEventListener("resizeEnd", resolve, {once: true}); + if (win.outerWidth != width || win.outerHeight != height) { win.resizeTo(width, height); await new IdlePromise(win); - }, {timeout: 5000}); - - win.removeEventListener("resize", debounce); + } } if (x != null && y != null) {