Bug 1383876 - Part 6: Fix eslint failures, a=bustage
authorNika Layzell <nika@thelayzells.com>
Fri, 12 Jan 2018 18:40:50 -0500
changeset 399190 e0683e2979c081e89ae9ffe543a8adccb3ad9019
parent 399189 6d9855f7bfdb0f514ecfb352a1b0a5a62d83b915
child 399191 3354748709685443b04cc925547c3c67d5135a8c
push id58017
push userccoroiu@mozilla.com
push dateSat, 13 Jan 2018 10:04:14 +0000
treeherderautoland@8c65a1c9b8d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1383876
milestone59.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 1383876 - Part 6: Fix eslint failures, a=bustage MozReview-Commit-ID: 90yfcMlr6UU
browser/components/sessionstore/content/content-sessionStore.js
toolkit/modules/sessionstore/SessionHistory.jsm
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/browser/components/sessionstore/content/content-sessionStore.js
@@ -228,17 +228,16 @@ var MessageListener = {
         break;
       case "SessionStore:resetRestore":
         gContentRestore.resetRestore();
         break;
       case "SessionStore:flush":
         this.flush(data);
         break;
       case "SessionStore:becomeActiveProcess":
-        let shistory = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
         SessionHistoryListener.collect();
         break;
       default:
         debug("received unknown message '" + name + "'");
         break;
     }
   },
 
--- a/toolkit/modules/sessionstore/SessionHistory.jsm
+++ b/toolkit/modules/sessionstore/SessionHistory.jsm
@@ -72,17 +72,16 @@ var SessionHistoryInternal = {
    * @param aFromIdx
    *        The starting local index to collect the history from.
    * @return An object reprereseting a partial global history update.
    */
   collect(docShell, aFromIdx = -1) {
     let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
     let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
     let history = webNavigation.sessionHistory.QueryInterface(Ci.nsISHistoryInternal);
-    let ihistory = history.QueryInterface(Ci.nsISHistory);
 
     let data = {entries: [], userContextId: loadContext.originAttributes.userContextId };
     // We want to keep track how many entries we *could* have collected and
     // how many we skipped, so we can sanitiy-check the current history index
     // and also determine whether we need to get any fallback data or not.
     let skippedCount = 0, entryCount = 0;
 
     if (history && history.count > 0) {