Bug 927568 - fix misplaced null check in marionette-server.js, r=mdas
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Mon, 21 Oct 2013 10:32:48 -0400
changeset 151492 9445d7191df4508d68bf618a6802db253aa49346
parent 151491 6c85d3c1901222cf531321dce8652dea7734d126
child 151493 cbaa108583eef5bbfb261bbe79ef787879d7b082
push id35198
push userahalberstadt@mozilla.com
push dateMon, 21 Oct 2013 14:33:22 +0000
treeherdermozilla-inbound@9445d7191df4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdas
bugs927568
milestone27.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 927568 - fix misplaced null check in marionette-server.js, r=mdas
testing/marionette/marionette-server.js
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -2176,17 +2176,17 @@ MarionetteServerConnection.prototype = {
       case "Marionette:register":
         // This code processes the content listener's registration information
         // and either accepts the listener, or ignores it
         let nullPrevious = (this.curBrowser.curFrameId == null);
         let listenerWindow = 
                             Services.wm.getOuterWindowWithId(message.json.value);
 
         //go in here if we're already in a remote frame.
-        if (!listenerWindow || (listenerWindow.location.href != message.json.href) &&
+        if ((!listenerWindow || listenerWindow.location.href != message.json.href) &&
             (this.curBrowser.frameManager.currentRemoteFrame !== null)) {
           // The outerWindowID from an OOP frame will not be meaningful to
           // the parent process here, since each process maintains its own
           // independent window list.  So, it will either be null (!listenerWindow)
           // if we're already in a remote frame,
           // or it will point to some random window, which will hopefully 
           // cause an href mismatch.  Currently this only happens
           // in B2G for OOP frames registered in Marionette:switchToFrame, so