Bug 1274274 - Rename element store clear function to delete; r=automatedtester
authorAndreas Tolfsen <ato@mozilla.com>
Fri, 20 May 2016 16:54:42 +0100
changeset 337939 769533c99dd8cc09e7c9dfe4327660b925aa7037
parent 337938 74c4d72ac0dee69aea077a1615d50cf70b84ec21
child 337940 8eb0aaeb31344b0800469018c658e0f1c84d5823
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1274274
milestone49.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 1274274 - Rename element store clear function to delete; r=automatedtester This matches the Map data structure in JavaScript. MozReview-Commit-ID: 5l2xOb4W2BC
testing/marionette/element.js
testing/marionette/listener.js
--- a/testing/marionette/element.js
+++ b/testing/marionette/element.js
@@ -64,17 +64,17 @@ element.Strategy = {
  * may be queried by their web element reference using |get(element)|.
  */
 element.Store = class {
   constructor() {
     this.els = {};
     this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
   }
 
-  reset() {
+  clear() {
     this.els = {};
   }
 
   /**
    * Make a collection of elements seen.
    *
    * The oder of the returned web element references is guaranteed to
    * match that of the collection passed in.
--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -402,17 +402,17 @@ function deleteSession(msg) {
   removeMessageListenerId("Marionette:getScreenshotHash", getScreenshotHashFn);
   removeMessageListenerId("Marionette:addCookie", addCookieFn);
   removeMessageListenerId("Marionette:getCookies", getCookiesFn);
   removeMessageListenerId("Marionette:deleteAllCookies", deleteAllCookiesFn);
   removeMessageListenerId("Marionette:deleteCookie", deleteCookieFn);
   if (isB2G) {
     content.removeEventListener("mozbrowsershowmodalprompt", modalHandler, false);
   }
-  seenEls.reset();
+  seenEls.clear();
   // reset container frame to the top-most frame
   curContainer = { frame: content, shadowRoot: null };
   curContainer.frame.focus();
   actions.touchIds = {};
 }
 
 /**
  * Send asynchronous reply to chrome.