Issue 3503 - Fixed: Screenshot marker in Issue Reporter is no longer red

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 341 matching lines @@
   },
 
   setData: function(screenshot)
   {
     let canvas = E("screenshotCanvas");
 
     // 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;
 
-    if (screenshot)
-    {
-      let image = new Image();
-      image.src = 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 drawScreenshot = new Promise((resolve, reject) => {
+      if (screenshot)
+      {
+        let image = new Image();
+        image.src = 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);
+          resolve();
+        });
+      }
+      else
+        resolve();
+    });
+
+    drawScreenshot.then(() => {
+      // Init canvas settings, this has to be done after the canvas size is set
+      context.fillStyle = "rgb(0, 0, 0)";
+      context.strokeStyle = "rgba(255, 0, 0, 0.7)";
+      context.lineWidth = 3;
+      context.lineJoin = "round";
+    });
   },
 
   get enabled()
   {
     return this._enabled
   },
   set enabled(enabled)
   {
     if (this._enabled == enabled)
       return;
@@ skipping 1161 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;");
 }