Bug 1319237 - Calculate correct window position; r?automatedtester draft
authorAndreas Tolfsen <ato@mozilla.com>
Mon, 21 Nov 2016 23:33:03 +0100
changeset 442945 7807217154c93f5327dbe53f9c8eefe7b2a72348
parent 442944 390614ab1ad730cef3001a99263225653b25b524
child 442946 ecaf001fc1da8dce9f97b6c1f8c9187cfeff9af6
push id36874
push userbmo:ato@mozilla.com
push dateWed, 23 Nov 2016 16:09:45 +0000
reviewersautomatedtester
bugs1319237
milestone53.0a1
Bug 1319237 - Calculate correct window position; r?automatedtester The testing/marionette/browser.js window getter does not return the same window as `GeckoDriver#getCurrentWindow`. This is a problem, but for now we can rely on `getCurrentWindow`. MozReview-Commit-ID: PT9M7boPM7
testing/marionette/browser.js
testing/marionette/driver.js
--- a/testing/marionette/browser.js
+++ b/testing/marionette/browser.js
@@ -263,26 +263,16 @@ browser.Context = class {
   executeWhenReady(cb) {
     if (this.hasRemotenessChange()) {
       this.pendingCommands.push(cb);
     } else {
       cb();
     }
   }
 
-  /**
-   * Returns the position of the OS window.
-   */
-  get position() {
-    return {
-      x: this.window.screenX,
-      y: this.window.screenY,
-    };
-  }
-
 };
 
 /**
  * The window storage is used to save outer window IDs mapped to weak
  * references of Window objects.
  *
  * Usage:
  *
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -1234,17 +1234,21 @@ GeckoDriver.prototype.getChromeWindowHan
 
 /**
  * Get the current window position.
  *
  * @return {Object.<string, number>}
  *     Object with |x| and |y| coordinates.
  */
 GeckoDriver.prototype.getWindowPosition = function(cmd, resp) {
-  return this.curBrowser.position;
+  let win = this.getCurrentWindow();
+  return {
+    x: win.screenX,
+    y: win.screenY,
+  };
 };
 
 /**
  * Set the window position of the browser on the OS Window Manager
  *
  * @param {number} x
  *     X coordinate of the top/left of the window that it will be
  *     moved to.