Issue 6684 - Issue Reporter Active Tab Screenshot

popup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 85 matching lines @@
   {
     window.clearTimeout(activateClickHide.timeout);
     activateClickHide.timeout = null;
   }
   document.body.classList.remove("clickhide-active");
   browser.tabs.sendMessage(tab.id, {type: "composer.content.finished"});
 }
 
 function reportIssue()
 {
-  browser.tabs.create({
-    url: browser.runtime.getURL("/issue-reporter.html?" + tab.id)
-  }).then(() =>
-  {
-    window.close();
-  });
+  browser.tabs.captureVisibleTab(
+    null,
+    {format: "png"},
+    screenshot =>
+    {
+      // in some obscure circumstance the screenshot is undefined
+      // but asking again for it later on will work every time
+      if (!screenshot)
+        return setTimeout(reportIssue);
+
+      // setup a listener to provide once tab url
+      // and base64 screenshot data once asked
+      browser.runtime.onMessage.addListener(
+        function onMessage(event)
+        {
+          if (event.type == "issue-reporter")
+          {
+            browser.runtime.onMessage.removeListener(onMessage);
+            return Promise.resolve({url: tab.url, screenshot});
+          }
+        }
+      );
+
+      browser.tabs.create({
+        active: true,
+        url: browser.runtime.getURL("/issue-reporter.html?" + tab.id)
+      });
+    }
+  );
 }
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   let collapsible = document.getElementById(collapser.dataset.collapsible);
   collapsible.classList.toggle("collapsed");
   togglePref(collapser.dataset.option);
 }
 
@@ skipping 210 matching lines @@
       {
         if (event.target.id == "notification-optout")
           setPref("notifications_ignoredcategories", true);
 
         notificationElement.hidden = true;
         browser.runtime.sendMessage({type: "notifications.clicked"});
       }
     }, true);
   });
 });