Issue 3375 - Issue reporter: move screenshot creation into the content process

chrome/content/ui/sendReport.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 319 matching lines @@
   _undoQueue: [],
 
   collectData: function(wnd, windowURI, callback)
   {
     let outerWindowID = wnd.QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindowUtils)
                            .outerWindowID;
     let dataCollector = require("dataCollector");
     let canvas = E("screenshotCanvas");
     let screenshotWidth = canvas.offsetWidth - this.imageOffset * 2;
+
+    // Do not resize canvas any more (no idea why Gecko requires both to be set)
+    canvas.parentNode.style.MozBoxAlign = "center";
+    canvas.parentNode.align = "center";
+
+    // Init canvas settings
+    let context = canvas.getContext("2d");
+    context.fillStyle = "rgb(0, 0, 0)";
+    context.strokeStyle = "rgba(255, 0, 0, 0.7)";
+    context.lineWidth = 3;
+    context.lineJoin = "round";
+
+    this._canvas = canvas;
+    this._context = context;
+
     dataCollector.collectData(outerWindowID, screenshotWidth, data => {
-      if (!data || !data.screenshot)
-      {
-        callback();
-        return;
+      if (data && data.screenshot)
+      {
+        let image = new Image();
+        image.src = data.screenshot;
+        image.addEventListener("load", () => {
+          canvas.width = image.width + this.imageOffset * 2;
+          canvas.height = image.height + this.imageOffset * 2;
+          context.drawImage(image, this.imageOffset, this.imageOffset);
+        });
       }
-
-      let image = new Image();
-      image.src = data.screenshot;
-      image.addEventListener("load", () => {
-        canvas.width = image.width + this.imageOffset * 2;
-        canvas.height = image.height + this.imageOffset * 2;
-
-        // Do not resize canvas any more (no idea why Gecko requires both to be set)
-        canvas.parentNode.style.MozBoxAlign = "center";
-        canvas.parentNode.align = "center";
-
-        let context = canvas.getContext("2d");
-        context.drawImage(image, this.imageOffset, this.imageOffset);
-
-        // Init canvas settings
-        context.fillStyle = "rgb(0, 0, 0)";
-        context.strokeStyle = "rgba(255, 0, 0, 0.7)";
-        context.lineWidth = 3;
-        context.lineJoin = "round";
-
-        this._canvas = canvas;
-        this._context = context;
-
-        callback();
-      });
+      callback();
     });
   },
 
   get enabled() this._enabled,
   set enabled(enabled)
   {
     if (this._enabled == enabled)
       return;
 
     this._enabled = enabled;
@@ skipping 1168 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }