From be454cdf363ac72ce9a65d312f054dc722402056 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 4 Aug 2016 00:55:07 -0400
Subject: [PATCH] Bug 1292008 - Enable the no-empty rule for eslint. r=markh

MozReview-Commit-ID: EfM3YOUjClW

--HG--
extra : rebase_source : 47cb04f0a58df6ae810cbf41f7a09e3bb0130997
---
 .../base/content/browser-gestureSupport.js    | 35 +++++++++----------
 browser/components/nsBrowserContentHandler.js |  2 +-
 toolkit/.eslintrc                             |  2 +-
 toolkit/components/narrate/Narrator.jsm       |  6 +++-
 .../tests/unit/test_ThreadHangStats.js        |  6 ++--
 toolkit/modules/GMPUtils.jsm                  |  2 --
 6 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
index d356d5aba454..1ce33911c000 100644
--- a/browser/base/content/browser-gestureSupport.js
+++ b/browser/base/content/browser-gestureSupport.js
@@ -987,25 +987,22 @@ var gHistorySwipeAnimation = {
 
     let canvas = null;
 
-    try {
-      let browser = gBrowser.selectedBrowser;
-      let r = browser.getBoundingClientRect();
-      canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
-                                        "canvas");
-      canvas.mozOpaque = true;
-      let scale = window.devicePixelRatio;
-      canvas.width = r.width * scale;
-      canvas.height = r.height * scale;
-      let ctx = canvas.getContext("2d");
-      let zoom = browser.markupDocumentViewer.fullZoom * scale;
-      ctx.scale(zoom, zoom);
-      ctx.drawWindow(browser.contentWindow,
-                     0, 0, canvas.width / zoom, canvas.height / zoom, "white",
-                     ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
-                     ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
-                     ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
-    } finally {
-    }
+    let browser = gBrowser.selectedBrowser;
+    let r = browser.getBoundingClientRect();
+    canvas = document.createElementNS("http://www.w3.org/1999/xhtml",
+                                      "canvas");
+    canvas.mozOpaque = true;
+    let scale = window.devicePixelRatio;
+    canvas.width = r.width * scale;
+    canvas.height = r.height * scale;
+    let ctx = canvas.getContext("2d");
+    let zoom = browser.markupDocumentViewer.fullZoom * scale;
+    ctx.scale(zoom, zoom);
+    ctx.drawWindow(browser.contentWindow,
+                   0, 0, canvas.width / zoom, canvas.height / zoom, "white",
+                   ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW |
+                   ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES |
+                   ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
 
     TelemetryStopwatch.start("FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE");
     try {
diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index 163506c2d38b..c8c2688fdc7e 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -738,7 +738,7 @@ nsDefaultCommandLineHandler.prototype = {
           this._haveProfile = true;
         }
         catch (e) {
-          while ((ar = cmdLine.handleFlagWithParam("url", false))) { }
+          while ((ar = cmdLine.handleFlagWithParam("url", false)));
           cmdLine.preventDefault = true;
         }
       }
diff --git a/toolkit/.eslintrc b/toolkit/.eslintrc
index bb778829fbd5..857f8006b981 100644
--- a/toolkit/.eslintrc
+++ b/toolkit/.eslintrc
@@ -71,7 +71,7 @@
     "no-else-return": 2,
 
     // No empty statements
-    // "no-empty": 2,
+    "no-empty": [2, "allowEmptyCatch": true],
 
     // No empty character classes in regex
     "no-empty-character-class": 2,
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index ad85f26b6ec6..baea4593730f 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -216,7 +216,11 @@ Narrator.prototype = {
       let tw = this._treeWalker;
       if (!this._isParagraphInView(tw.currentNode)) {
         tw.currentNode = tw.root;
-        while (tw.nextNode() && !this._isParagraphInView(tw.currentNode)) {}
+        while (tw.nextNode()) {
+          if (this._isParagraphInView(tw.currentNode)) {
+            break;
+          }
+        }
         // _speakInner will advance to the next node for us, so we need
         // to have it one paragraph back from the first visible one.
         tw.previousNode();
diff --git a/toolkit/components/telemetry/tests/unit/test_ThreadHangStats.js b/toolkit/components/telemetry/tests/unit/test_ThreadHangStats.js
index 2826abbf29fb..e8c9f868ab3f 100644
--- a/toolkit/components/telemetry/tests/unit/test_ThreadHangStats.js
+++ b/toolkit/components/telemetry/tests/unit/test_ThreadHangStats.js
@@ -39,15 +39,13 @@ function run_test() {
   do_execute_soon(() => {
     // Cause a hang lasting 1 second (transient hang).
     let startTime = Date.now();
-    while ((Date.now() - startTime) < 1000) {
-    }
+    while ((Date.now() - startTime) < 1000);
   });
 
   do_execute_soon(() => {
     // Cause a hang lasting 10 seconds (permanent hang).
     let startTime = Date.now();
-    while ((Date.now() - startTime) < 10000) {
-    }
+    while ((Date.now() - startTime) < 10000);
   });
 
   do_execute_soon(() => {
diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.jsm
index 265d80280e26..4423f25b8bd6 100644
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -68,8 +68,6 @@ this.GMPUtils = {
       return true;
     }
     if (aPlugin.id == EME_ADOBE_ID) {
-      if (Services.appinfo.OS != "WINNT") {
-      }
       // Windows Vista and later only supported by Adobe EME.
       return AppConstants.isPlatformAndVersionAtLeast("win", "6");
     } else if (aPlugin.id == WIDEVINE_ID) {