Merge mozilla-central to mozilla-inbound

.eslintignore

@@ -129,11 +129,6 @@ devtools/client/webconsole/webconsole-connection-proxy.js
 devtools/client/webconsole/webconsole.js
 devtools/client/webide/**
 !devtools/client/webide/components/webideCli.js
-devtools/server/actors/webconsole.js
-devtools/server/actors/object.js
-devtools/server/actors/script.js
-devtools/server/actors/styleeditor.js
-devtools/server/actors/stylesheets.js
 devtools/server/tests/browser/storage-*.html
 !devtools/server/tests/browser/storage-unsecured-iframe.html
 devtools/server/tests/browser/stylesheets-nested-iframes.html

.eslintrc.js

@@ -15,11 +15,11 @@ module.exports = {
     "mozilla/no-useless-removeEventListener": "error",
     "mozilla/use-default-preference-values": "error",
     "mozilla/use-ownerGlobal": "error",
-
     // No (!foo in bar) or (!object instanceof Class)
     "no-unsafe-negation": "error",
     // No eval() and no strings in the first param of setTimeout or setInterval
     "no-implied-eval": "error",
+    "no-eval": "error",
   },
   "env": {
     "es6": true

browser/app/profile/firefox.js

@@ -1152,7 +1152,6 @@ pref("services.sync.prefs.sync.dom.event.contextmenu.enabled", true);
 pref("services.sync.prefs.sync.extensions.personas.current", true);
 pref("services.sync.prefs.sync.extensions.update.enabled", true);
 pref("services.sync.prefs.sync.intl.accept_languages", true);
-pref("services.sync.prefs.sync.javascript.enabled", true);
 pref("services.sync.prefs.sync.layout.spellcheckDefault", true);
 pref("services.sync.prefs.sync.lightweightThemes.selectedThemeID", true);
 pref("services.sync.prefs.sync.lightweightThemes.usedThemes", true);

browser/base/content/browser-sync.js

@@ -8,10 +8,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "EnsureFxAccountsWebChannel",
   "resource://gre/modules/FxAccountsWebChannel.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Weave",
   "resource://services-sync/main.js");
-if (AppConstants.MOZ_SERVICES_CLOUDSYNC) {
-  XPCOMUtils.defineLazyModuleGetter(this, "CloudSync",
-                                    "resource://gre/modules/CloudSync.jsm");
-}
 
 const MIN_STATUS_ANIMATION_DURATION = 1600;
 
@@ -223,9 +219,7 @@ var gSync = {
     document.getElementById("sync-setup-state").hidden = true;
     document.getElementById("sync-syncnow-state").hidden = true;
 
-    if (CloudSync && CloudSync.ready && CloudSync().adapters.count) {
-      document.getElementById("sync-syncnow-state").hidden = false;
-    } else if (status == UIState.STATUS_LOGIN_FAILED) {
+    if (status == UIState.STATUS_LOGIN_FAILED) {
       // unhiding this element makes the menubar show the login failure state.
       document.getElementById("sync-reauth-state").hidden = false;
     } else if (status == UIState.STATUS_NOT_CONFIGURED ||

browser/base/content/browser.css

@@ -999,17 +999,6 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > #downloads-
   display: none;
 }
 
-#downloads-button.withProgressBar:-moz-any([progress], [counter], [paused]) #downloads-indicator-icon,
-#downloads-button:not(:-moz-any([progress], [counter], [paused])) #downloads-indicator-progress-area {
-  visibility: hidden;
-}
-
-/* Hide elements for another type of progressmeter if it's not in use. */
-#downloads-button.withProgressBar #downloads-indicator-progress-icon,
-#downloads-button:not(.withProgressBar) #downloads-indicator-progress-area {
-  visibility: hidden;
-}
-
 /* Combobox dropdown renderer */
 #ContentSelectDropdown > menupopup {
   /* The menupopup itself should always be rendered LTR to ensure the scrollbar aligns with

browser/base/content/nsContextMenu.js

@@ -56,6 +56,14 @@ function openContextMenu(aMessage) {
                             };
   let popup = browser.ownerDocument.getElementById("contentAreaContextMenu");
   let event = gContextMenuContentData.event;
+
+  // Set touch mode to get larger menu items.
+  if (event.mozInputSource == MouseEvent.MOZ_SOURCE_TOUCH) {
+    popup.setAttribute("touchmode", "true");
+  } else {
+    popup.removeAttribute("touchmode");
+  }
+
   popup.openPopupAtScreen(event.screenX, event.screenY, true);
 }
 

browser/base/content/sync/aboutSyncTabs.js

@@ -17,20 +17,13 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 
-if (AppConstants.MOZ_SERVICES_CLOUDSYNC) {
-  XPCOMUtils.defineLazyModuleGetter(this, "CloudSync",
-                                    "resource://gre/modules/CloudSync.jsm");
-}
-
 var RemoteTabViewer = {
   _tabsList: null,
 
   init() {
     Services.obs.addObserver(this, "weave:service:login:finish");
     Services.obs.addObserver(this, "weave:engine:sync:finish");
 
-    Services.obs.addObserver(this, "cloudsync:tabs:update");
-
     this._tabsList = document.getElementById("tabsList");
 
     this.buildList(true);
@@ -39,8 +32,6 @@ var RemoteTabViewer = {
   uninit() {
     Services.obs.removeObserver(this, "weave:service:login:finish");
     Services.obs.removeObserver(this, "weave:engine:sync:finish");
-
-    Services.obs.removeObserver(this, "cloudsync:tabs:update");
   },
 
   createItem(attrs) {
@@ -178,18 +169,9 @@ var RemoteTabViewer = {
       //        or tell the appropriate condition. (bug 583344)
     }
 
-    let complete = () => {
-      this._waitingForBuildList = false;
-      if (this._buildListRequested) {
-        CommonUtils.nextTick(this.buildList, this);
-      }
-    }
-
-    if (CloudSync && CloudSync.ready && CloudSync().tabsReady && CloudSync().tabs.hasRemoteTabs()) {
-      this._generateCloudSyncTabList()
-          .then(complete, complete);
-    } else {
-      complete();
+    this._waitingForBuildList = false;
+    if (this._buildListRequested) {
+      CommonUtils.nextTick(this.buildList, this);
     }
   },
 
@@ -246,36 +228,6 @@ var RemoteTabViewer = {
     }
   },
 
-  _generateCloudSyncTabList() {
-    let updateTabList = remoteTabs => {
-      let list = this._tabsList;
-
-      for (let client of remoteTabs) {
-        let clientAttrs = {
-          type: "client",
-          clientName: client.name,
-        };
-
-        let clientEnt = this.createItem(clientAttrs);
-        list.appendChild(clientEnt);
-
-        for (let tab of client.tabs) {
-          let tabAttrs = {
-            type: "tab",
-            title: tab.title,
-            url: tab.url,
-            icon: this.getIcon(tab.icon),
-          };
-          let tabEnt = this.createItem(tabAttrs);
-          list.appendChild(tabEnt);
-        }
-      }
-    };
-
-    return CloudSync().tabs.getRemoteTabs()
-                           .then(updateTabList, Promise.reject.bind(Promise));
-  },
-
   adjustContextMenu(event) {
     let mode = "all";
     switch (this._tabsList.selectedItems.length) {
@@ -335,9 +287,6 @@ var RemoteTabViewer = {
           this.buildList(false);
         }
         break;
-      case "cloudsync:tabs:update":
-        this.buildList(false);
-        break;
     }
   },
 

browser/base/content/tabbrowser.css

@@ -52,11 +52,11 @@
 }
 
 .tab-label-container[textoverflow]:not([pinned]) {
-  mask-image: linear-gradient(to left, transparent, black 1em);
+  mask-image: linear-gradient(to left, transparent, black 2em);
 }
 
 .tab-label-container[textoverflow]:not([pinned]):-moz-locale-dir(rtl) {
-  mask-image: linear-gradient(to right, transparent, black 1em);
+  mask-image: linear-gradient(to right, transparent, black 2em);
 }
 
 .tab-stack {

browser/base/content/test/general/browser_aboutHome.js

@@ -568,6 +568,7 @@ function* withSnippetsMap(setupFn, testFn, testArgs = null, parentFn = null) {
           document.addEventListener("AboutHomeLoadSnippets", function() {
             let updateSnippets;
             if (args.setupFnSource) {
+              // eslint-disable-next-line no-eval
               updateSnippets = eval(`(() => (${args.setupFnSource}))()`);
             }
 

browser/base/content/test/general/browser_bug633691.js

@@ -16,8 +16,10 @@ add_task(function* test() {
 
       yield loadError;
 
+      /* eslint-disable no-eval */
       let is_hidden = eval(`(() => ${is_hidden_})()`);
       let is_element_hidden = eval(`(() => ${is_element_hidden_})()`);
+      /* eslint-enable no-eval */
       let doc = content.document.getElementsByTagName("iframe")[0].contentDocument;
       let aP = doc.getElementById("badCertAdvancedPanel");
       ok(aP, "Advanced content should exist");

browser/base/content/test/newtab/head.js

@@ -143,6 +143,7 @@ function performOnCell(aIndex, aFn) {
   return ContentTask.spawn(gWindow.gBrowser.selectedBrowser,
                            { index: aIndex, fn: aFn.toString() }, function* (args) {
     let cell = content.gGrid.cells[args.index];
+    // eslint-disable-next-line no-eval
     return eval(args.fn)(cell);
   });
 }

browser/base/content/test/static/browser_all_files_referenced.js

@@ -57,7 +57,6 @@ var whitelist = new Set([
   {file: "chrome://global/locale/printjoboptions.dtd",
    platforms: ["macosx", "win"]},
 
-  // services/cloudsync/CloudSyncLocal.jsm
   {file: "chrome://weave/locale/errors.properties"},
 
   // devtools/client/inspector/bin/dev-server.js