tor-browser

commit 8819c72dc5b2c3b042e732e1db839dba07666dbb
parent 73d18ae1e7bf6f2d2b598c99b3336916bae5be35
Author: Calixte Denizet <calixte.denizet@gmail.com>
Date:   Fri,  3 Oct 2025 07:30:50 +0000

Bug 1988280 - Fix the telemetry when saving a pdf with some highlights r=marco

and enable the test for highlighting telemetry stuff.

Differential Revision: https://phabricator.services.mozilla.com/D267233

Diffstat:
M
toolkit/components/pdfjs/content/PdfJsTelemetry.sys.mjs
 | 
14
++++++++++----
M
toolkit/components/pdfjs/test/browser.toml
 | 
2
+-
M
toolkit/components/pdfjs/test/browser_pdfjs_highlight_telemetry.js
 | 
2
+-

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/toolkit/components/pdfjs/content/PdfJsTelemetry.sys.mjs b/toolkit/components/pdfjs/content/PdfJsTelemetry.sys.mjs
@@ -114,20 +114,26 @@ export class PdfJsTelemetry {
         if (!stats) {
           return;
         }
-        if (data.type === "highlight") {
+
+        if (stats.highlight) {
           const numbers = ["one", "two", "three", "four", "five"];
           Glean.pdfjsEditingHighlight[data.type].add(1);
           Glean.pdfjsEditingHighlight.numberOfColors[
-            numbers[stats.highlight.numberOfColors - 1]
+            numbers[
+              Math.min(
+                Math.max(1, stats.highlight.numberOfColors),
+                numbers.length
+              ) - 1
+            ]
           ].add(1);
-          return;
         }
         if (stats.stamp) {
           this.onImage({
             action: "pdfjs.image.added",
             data: stats.stamp,
           });
-        } else if (stats.signature) {
+        }
+        if (stats.signature) {
           this.onSignature({
             action: "pdfjs.signature.added",
             data: stats.signature,
diff --git a/toolkit/components/pdfjs/test/browser.toml b/toolkit/components/pdfjs/test/browser.toml
@@ -55,7 +55,7 @@ support-files = ["file_pdfjs_form.pdf"]
 support-files = ["file_pdfjs_hcm.pdf"]
 
 ["browser_pdfjs_highlight_telemetry.js"]
-skip-if = ["true"]
+run-if = ["!headless"]
 
 ["browser_pdfjs_jpeg2000.js"]
 support-files = ["file_pdfjs_jp2_image.pdf"]
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_highlight_telemetry.js b/toolkit/components/pdfjs/test/browser_pdfjs_highlight_telemetry.js
@@ -218,7 +218,7 @@ add_task(async function test() {
       );
 
       telemetryPromise = waitForTelemetry(browser);
-      await EventUtils.synthesizeKey("KEY_Delete");
+      await click(browser, ".highlightEditor button.deleteButton");
       await telemetryPromise;
 
       await Services.fog.testFlushAllChildren();