From ad94336c667587daee5fe832727d65af05083726 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Mon, 10 Mar 2014 13:47:12 +0900
Subject: [PATCH] Bug 979161 part 2 - Wrap long lines in paint_listener.js;
 r=mattwoodrow

And also simplify the code somewhat
---
 .../tests/SimpleTest/paint_listener.js        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/testing/mochitest/tests/SimpleTest/paint_listener.js b/testing/mochitest/tests/SimpleTest/paint_listener.js
index 71b0d846d673..968d3f87ad1b 100644
--- a/testing/mochitest/tests/SimpleTest/paint_listener.js
+++ b/testing/mochitest/tests/SimpleTest/paint_listener.js
@@ -6,19 +6,20 @@
   function paintListener(event) {
     if (event.target != window)
       return;
+    var eventRect =
+      [ event.boundingClientRect.left,
+        event.boundingClientRect.top,
+        event.boundingClientRect.right,
+        event.boundingClientRect.bottom ];
     if (debug) {
-      dump("got MozAfterPaint: " + event.boundingClientRect.left + "," + event.boundingClientRect.top + "," +
-           event.boundingClientRect.right + "," + event.boundingClientRect.bottom + "\n");
-    }
-    if (accumulatedRect) {
-      accumulatedRect[0] = Math.min(accumulatedRect[0], event.boundingClientRect.left);
-      accumulatedRect[1] = Math.min(accumulatedRect[1], event.boundingClientRect.top);
-      accumulatedRect[2] = Math.max(accumulatedRect[2], event.boundingClientRect.right);
-      accumulatedRect[3] = Math.max(accumulatedRect[3], event.boundingClientRect.bottom);
-    } else {
-      accumulatedRect = [event.boundingClientRect.left, event.boundingClientRect.top,
-                         event.boundingClientRect.right, event.boundingClientRect.bottom];
+      dump("got MozAfterPaint: " + eventRect.join(",") + "\n");
     }
+    accumulatedRect = accumulatedRect
+                    ? [ Math.min(accumulatedRect[0], eventRect[0]),
+                        Math.min(accumulatedRect[1], eventRect[1]),
+                        Math.max(accumulatedRect[2], eventRect[2]),
+                        Math.max(accumulatedRect[3], eventRect[3]) ]
+                    : eventRect;
     onpaint();
   }
   window.addEventListener("MozAfterPaint", paintListener, false);
@@ -35,13 +36,10 @@
       if (debug) {
         dump("done...\n");
       }
-      var result = accumulatedRect;
+      var result = accumulatedRect || [ 0, 0, 0, 0 ];
       accumulatedRect = null;
       onpaint = function() {};
-      if (!result) {
-        result = [0,0,0,0];
-      }
-      callback(result[0], result[1], result[2], result[3]);
+      callback.apply(null, result);
       return;
     }
     if (debug) {