tor-browser

commit 0c22beffb811e325873bfaece08fb3fd0bafebae
parent b8672273a38808f13631ae7fb6c09541cfd9770a
Author: Serban Stanca <sstanca@mozilla.com>
Date:   Tue, 28 Oct 2025 19:31:58 +0200

Revert "Bug 1993095. Don't include "application/x-moz-file" in types. r=tschuster" for causing mochitests failures in test_paste_image.html.

This reverts commit 57330b0845783100f2872998953380484667920e.

Diffstat:
M
browser/base/content/test/general/browser_clipboard_pastefile.js
 | 
8
++++++--
M
browser/base/content/test/general/clipboard_pastefile.html
 | 
6
++++--
M
dom/events/DataTransferItemList.cpp
 | 
10
+++++++---
M
toolkit/components/contentanalysis/tests/browser/browser_clipboard_paste_file_content_analysis.js
 | 
16
++++++++++++----
M
toolkit/components/contentanalysis/tests/browser/clipboard_paste_file.html
 | 
6
++++--

5 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js
@@ -78,9 +78,13 @@ add_task(async function () {
       "paste",
       function (event) {
         let dt = event.clipboardData;
-        is(dt.types.length, 2, "number of types");
+        is(dt.types.length, 3, "number of types");
         ok(dt.types.includes("text/plain"), "text/plain exists in types");
-        is(dt.types[1], "Files", "Last type should be 'Files'");
+        ok(
+          dt.types.includes("application/x-moz-file"),
+          "application/x-moz-file exists in types"
+        );
+        is(dt.types[2], "Files", "Last type should be 'Files'");
         ok(
           dt.mozTypesAt(0).contains("text/plain"),
           "text/plain exists in mozTypesAt"
diff --git a/browser/base/content/test/general/clipboard_pastefile.html b/browser/base/content/test/general/clipboard_pastefile.html
@@ -22,9 +22,11 @@ function is(a, b, msg) {
 async function checkPasteHelper(event) {
   let dt = event.clipboardData;
 
-  is(dt.types.length, 1, "Correct number of types");
+  is(dt.types.length, 2, "Correct number of types");
 
-  is(dt.types[0], "Files", "Last type must be Files");
+  // TODO: Remove application/x-moz-file from content.
+  is(dt.types[0], "application/x-moz-file", "First type")
+  is(dt.types[1], "Files", "Last type must be Files");
 
   is(dt.getData("text/plain"), "", "text/plain found with getData");
   is(dt.getData("application/x-moz-file"), "", "application/x-moz-file found with getData");
diff --git a/dom/events/DataTransferItemList.cpp b/dom/events/DataTransferItemList.cpp
@@ -450,9 +450,13 @@ void DataTransferItemList::GetTypes(nsTArray<nsString>& aTypes,
       continue;
     }
 
-    if (item->Kind() != DataTransferItem::KIND_FILE) {
-      nsAutoString type;
-      item->GetType(type);
+    // NOTE: The reason why we get the internal type here is because we want
+    // kFileMime to appear in the types list for backwards compatibility
+    // reasons.
+    nsAutoString type;
+    item->GetInternalType(type);
+    if (item->Kind() != DataTransferItem::KIND_FILE ||
+        type.EqualsASCII(kFileMime)) {
       aTypes.AppendElement(type);
     }
   }
diff --git a/toolkit/components/contentanalysis/tests/browser/browser_clipboard_paste_file_content_analysis.js b/toolkit/components/contentanalysis/tests/browser/browser_clipboard_paste_file_content_analysis.js
@@ -182,9 +182,13 @@ async function testClipboardPasteFileWithContentAnalysis(allowPaste) {
       "paste",
       function (event) {
         let dt = event.clipboardData;
-        is(dt.types.length, 2, "number of types");
+        is(dt.types.length, 3, "number of types");
         ok(dt.types.includes("text/plain"), "text/plain exists in types");
-        is(dt.types[1], "Files", "Last type should be 'Files'");
+        ok(
+          dt.types.includes("application/x-moz-file"),
+          "application/x-moz-file exists in types"
+        );
+        is(dt.types[2], "Files", "Last type should be 'Files'");
         ok(
           dt.mozTypesAt(0).contains("text/plain"),
           "text/plain exists in mozTypesAt"
@@ -343,9 +347,13 @@ async function testClipboardPasteDirectoryWithContentAnalysis(allowPaste) {
       "paste",
       function (event) {
         let dt = event.clipboardData;
-        is(dt.types.length, 2, "number of types");
+        is(dt.types.length, 3, "number of types");
         ok(dt.types.includes("text/plain"), "text/plain exists in types");
-        is(dt.types[1], "Files", "Last type should be 'Files'");
+        ok(
+          dt.types.includes("application/x-moz-file"),
+          "application/x-moz-file exists in types"
+        );
+        is(dt.types[2], "Files", "Last type should be 'Files'");
         ok(
           dt.mozTypesAt(0).contains("text/plain"),
           "text/plain exists in mozTypesAt"
diff --git a/toolkit/components/contentanalysis/tests/browser/clipboard_paste_file.html b/toolkit/components/contentanalysis/tests/browser/clipboard_paste_file.html
@@ -25,10 +25,12 @@ async function checkPasteHelper(event) {
   let filePasteAllowed = document.getElementById("pasteAllowed").checked;
   let pasteIsDir = document.getElementById("pasteIsDir").checked;
 
-  is(dt.types.length, filePasteAllowed ? 1 : 0, "Correct number of types");
+  is(dt.types.length, filePasteAllowed ? 2 : 0, "Correct number of types");
 
   if (filePasteAllowed) {
-    is(dt.types[0], "Files", "Last type must be Files");
+    // TODO: Remove application/x-moz-file from content.
+    is(dt.types[0], "application/x-moz-file", "First type")
+    is(dt.types[1], "Files", "Last type must be Files");
   }
 
   is(dt.getData("text/plain"), "", "text/plain found with getData");