author | Andreas Tolfsen <ato@mozilla.com> |
Fri, 21 Aug 2015 10:57:06 +0100 | |
changeset 258988 | 1bcda7156c4d8aeeffd21853e09a9fb452c488ef |
parent 258987 | a7fb70a151a1f562412c74e0d424f8a15cf48b6b |
child 258989 | ab7e85b0e839f04d1472a297b1d46cd384292a64 |
push id | 29268 |
push user | ryanvm@gmail.com |
push date | Tue, 25 Aug 2015 00:37:23 +0000 |
treeherder | mozilla-central@08015770c9d6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1197131 |
milestone | 43.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
|
testing/marionette/driver.js | file | annotate | diff | comparison | revisions | |
testing/marionette/listener.js | file | annotate | diff | comparison | revisions |
--- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -1283,17 +1283,17 @@ GeckoDriver.prototype.pageLoadPromise = GeckoDriver.prototype.getCurrentUrl = function(cmd, resp) { switch (this.context) { case Context.CHROME: resp.value = this.getCurrentWindow().location.href; break; case Context.CONTENT: let isB2G = this.appName == "B2G"; - resp.value = yield this.listener.getCurrentUrl({isB2G: isB2G}); + resp.value = yield this.listener.getCurrentUrl(isB2G); break; } }; /** Gets the current title of the window. */ GeckoDriver.prototype.getTitle = function(cmd, resp) { switch (this.context) { case Context.CHROME:
--- a/testing/marionette/listener.js +++ b/testing/marionette/listener.js @@ -1,9 +1,8 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ let {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; let uuidGen = Cc["@mozilla.org/uuid-generator;1"] .getService(Ci.nsIUUIDGenerator); @@ -187,33 +186,34 @@ function removeMessageListenerId(message let getElementSizeFn = dispatch(getElementSize); let getActiveElementFn = dispatch(getActiveElement); let clickElementFn = dispatch(clickElement); let getElementAttributeFn = dispatch(getElementAttribute); let getElementTextFn = dispatch(getElementText); let getElementTagNameFn = dispatch(getElementTagName); let getElementRectFn = dispatch(getElementRect); let isElementEnabledFn = dispatch(isElementEnabled); +let getCurrentUrlFn = dispatch(getCurrentUrl); /** * Start all message listeners */ function startListeners() { addMessageListenerId("Marionette:receiveFiles", receiveFiles); addMessageListenerId("Marionette:newSession", newSession); addMessageListenerId("Marionette:executeScript", executeScript); addMessageListenerId("Marionette:executeAsyncScript", executeAsyncScript); addMessageListenerId("Marionette:executeJSScript", executeJSScript); addMessageListenerId("Marionette:singleTap", singleTap); addMessageListenerId("Marionette:actionChain", actionChain); addMessageListenerId("Marionette:multiAction", multiAction); addMessageListenerId("Marionette:get", get); addMessageListenerId("Marionette:pollForReadyState", pollForReadyState); addMessageListenerId("Marionette:cancelRequest", cancelRequest); - addMessageListenerId("Marionette:getCurrentUrl", getCurrentUrl); + addMessageListenerId("Marionette:getCurrentUrl", getCurrentUrlFn); addMessageListenerId("Marionette:getTitle", getTitle); addMessageListenerId("Marionette:getPageSource", getPageSource); addMessageListenerId("Marionette:goBack", goBack); addMessageListenerId("Marionette:goForward", goForward); addMessageListenerId("Marionette:refresh", refresh); addMessageListenerId("Marionette:findElementContent", findElementContent); addMessageListenerId("Marionette:findElementsContent", findElementsContent); addMessageListenerId("Marionette:getActiveElement", getActiveElementFn); @@ -310,17 +310,17 @@ function deleteSession(msg) { removeMessageListenerId("Marionette:singleTap", singleTap); removeMessageListenerId("Marionette:actionChain", actionChain); removeMessageListenerId("Marionette:multiAction", multiAction); removeMessageListenerId("Marionette:get", get); removeMessageListenerId("Marionette:pollForReadyState", pollForReadyState); removeMessageListenerId("Marionette:cancelRequest", cancelRequest); removeMessageListenerId("Marionette:getTitle", getTitle); removeMessageListenerId("Marionette:getPageSource", getPageSource); - removeMessageListenerId("Marionette:getCurrentUrl", getCurrentUrl); + removeMessageListenerId("Marionette:getCurrentUrl", getCurrentUrlFn); removeMessageListenerId("Marionette:goBack", goBack); removeMessageListenerId("Marionette:goForward", goForward); removeMessageListenerId("Marionette:refresh", refresh); removeMessageListenerId("Marionette:findElementContent", findElementContent); removeMessageListenerId("Marionette:findElementsContent", findElementsContent); removeMessageListenerId("Marionette:getActiveElement", getActiveElementFn); removeMessageListenerId("Marionette:clickElement", clickElementFn); removeMessageListenerId("Marionette:getElementAttribute", getElementAttributeFn); @@ -1316,26 +1316,24 @@ function get(msg) { function cancelRequest() { navTimer.cancel(); if (onDOMContentLoaded) { removeEventListener("DOMContentLoaded", onDOMContentLoaded, false); } } /** - * Get URL of the top level browsing context. + * Get URL of the top-level browsing context. */ -function getCurrentUrl(msg) { - let url; - if (msg.json.isB2G) { - url = curFrame.location.href; +function getCurrentUrl(isB2G) { + if (isB2G) { + return curFrame.location.href; } else { - url = content.location.href; + return content.location.href; } - sendResponse({value: url}, msg.json.command_id); } /** * Get the current Title of the window */ function getTitle(msg) { sendResponse({value: curFrame.top.document.title}, msg.json.command_id); }