Bug 1776879, replace text/unicode for clipboard and drag and drop and…

… use text/plain directly, r=edgar,mak,stransky,geckoview-reviewers,extension-reviewers,zombie,m_kato Most usage is a straight replacement but gtk needs extra changes as it transfers plain text in UTF8 natively and needs to be converted into UTF16, and Windows uses single-byte characters for RTF and CF_HTML formats so we preserve this. Differential Revision: https://phabricator.services.mozilla.com/D158587
iaxat · Feb 1, 2023 · 394bb79 · 394bb79
1 parent 888d6ef
commit 394bb79
Show file tree

Hide file tree

Showing 101 changed files with 349 additions and 448 deletions.
diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js
@@ -847,11 +847,11 @@ function getTextFromClipboard() {
     return "";
   }
 
-  trans.addDataFlavor("text/unicode");
+  trans.addDataFlavor("text/plain");
   Services.clipboard.getData(trans, Services.clipboard.kGlobalClipboard);
 
   var str = {};
-  trans.getTransferData("text/unicode", str);
+  trans.getTransferData("text/plain", str);
 
   if (str) {
     str = str.value.QueryInterface(Ci.nsISupportsString);

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
@@ -1379,7 +1379,7 @@ var PlacesToolbarHelper = {
     }
 
     addData(PlacesUtils.TYPE_X_MOZ_URL, 0);
-    addData(PlacesUtils.TYPE_UNICODE, 0);
+    addData(PlacesUtils.TYPE_PLAINTEXT, 0);
     addData(PlacesUtils.TYPE_HTML, 0);
   },
 };

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -3176,7 +3176,7 @@ function readFromClipboard() {
     );
     trans.init(getLoadContext());
 
-    trans.addDataFlavor("text/unicode");
+    trans.addDataFlavor("text/plain");
 
     // If available, use selection clipboard, otherwise global one
     let clipboard = Services.clipboard;
@@ -3187,7 +3187,7 @@ function readFromClipboard() {
     }
 
     var data = {};
-    trans.getTransferData("text/unicode", data);
+    trans.getTransferData("text/plain", data);
 
     if (data) {
       data = data.value.QueryInterface(Ci.nsISupportsString);

diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_contenteditable.js b/browser/base/content/test/contextMenu/browser_contextmenu_contenteditable.js
@@ -93,9 +93,9 @@ add_task(async function test_contenteditable() {
     "text/html",
     PlacesUtils.toISupportsString("<strong>Bold text</strong>")
   );
-  xferable.addDataFlavor("text/unicode");
+  xferable.addDataFlavor("text/plain");
   xferable.setTransferData(
-    "text/unicode",
+    "text/plain",
     PlacesUtils.toISupportsString("Bold text")
   );
   Services.clipboard.setData(

diff --git a/browser/base/content/test/general/browser_bug1297539.js b/browser/base/content/test/general/browser_bug1297539.js
@@ -29,7 +29,7 @@ function getTransferableFromClipboard(asHTML) {
   if (asHTML) {
     trans.addDataFlavor("text/html");
   } else {
-    trans.addDataFlavor("text/unicode");
+    trans.addDataFlavor("text/plain");
   }
   Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard);
   return trans;

diff --git a/browser/base/content/test/general/browser_clipboard_pastefile.js b/browser/base/content/test/general/browser_clipboard_pastefile.js
@@ -16,12 +16,12 @@ function setClipboard(path) {
   trans.addDataFlavor("application/x-moz-file");
   trans.setTransferData("application/x-moz-file", file);
 
-  trans.addDataFlavor("text/unicode");
+  trans.addDataFlavor("text/plain");
   const str = Cc["@mozilla.org/supports-string;1"].createInstance(
     Ci.nsISupportsString
   );
   str.data = "Alternate";
-  trans.setTransferData("text/unicode", str);
+  trans.setTransferData("text/plain", str);
 
   // Write to clipboard.
   Services.clipboard.setData(trans, null, Ci.nsIClipboard.kGlobalClipboard);

diff --git a/browser/components/downloads/content/allDownloadsView.js b/browser/components/downloads/content/allDownloadsView.js
@@ -639,7 +639,7 @@ DownloadsPlacesView.prototype = {
     );
     trans.init(null);
 
-    let flavors = ["text/x-moz-url", "text/unicode"];
+    let flavors = ["text/x-moz-url", "text/plain"];
     flavors.forEach(trans.addDataFlavor);
 
     Services.clipboard.getData(trans, Services.clipboard.kGlobalClipboard);

diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js
@@ -471,7 +471,7 @@ var DownloadsPanel = {
       Ci.nsITransferable
     );
     trans.init(null);
-    let flavors = ["text/x-moz-url", "text/unicode"];
+    let flavors = ["text/x-moz-url", "text/plain"];
     flavors.forEach(trans.addDataFlavor);
     Services.clipboard.getData(trans, Services.clipboard.kGlobalClipboard);
     // Getting the data or creating the nsIURI might fail

diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
@@ -1793,7 +1793,7 @@ export var PlacesUIUtils = {
           let contents = [
             { type: lazy.PlacesUtils.TYPE_X_MOZ_URL, entries: [] },
             { type: lazy.PlacesUtils.TYPE_HTML, entries: [] },
-            { type: lazy.PlacesUtils.TYPE_UNICODE, entries: [] },
+            { type: lazy.PlacesUtils.TYPE_PLAINTEXT, entries: [] },
           ];
 
           contents.forEach(function(content) {
@@ -2034,7 +2034,7 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "URI_FLAVORS", () => {
   return [
     lazy.PlacesUtils.TYPE_X_MOZ_URL,
     TAB_DROP_TYPE,
-    lazy.PlacesUtils.TYPE_UNICODE,
+    lazy.PlacesUtils.TYPE_PLAINTEXT,
   ];
 });
 XPCOMUtils.defineLazyGetter(PlacesUIUtils, "SUPPORTED_FLAVORS", () => {
@@ -2271,7 +2271,7 @@ function getTransactionsForCopy(items, insertionIndex, insertionParentGuid) {
       });
     } else {
       let title =
-        item.type != lazy.PlacesUtils.TYPE_UNICODE ? item.title : item.uri;
+        item.type != lazy.PlacesUtils.TYPE_PLAINTEXT ? item.title : item.uri;
       transaction = lazy.PlacesTransactions.NewBookmark({
         index,
         parentGuid: insertionParentGuid,

diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
@@ -168,7 +168,7 @@ PlacesController.prototype = {
       case "cmd_paste":
       case "placesCmd_paste":
         // If the clipboard contains a Places flavor it is definitely pasteable,
-        // otherwise we also allow pasting "text/unicode" and "text/x-moz-url" data.
+        // otherwise we also allow pasting "text/plain" and "text/x-moz-url" data.
         // We don't check if the data is valid here, because the clipboard may
         // contain very large blobs that would largely slowdown commands updating.
         // Of course later paste() should ignore any invalid data.
@@ -178,7 +178,7 @@ PlacesController.prototype = {
             [
               ...PlacesUIUtils.PLACES_FLAVORS,
               PlacesUtils.TYPE_X_MOZ_URL,
-              PlacesUtils.TYPE_UNICODE,
+              PlacesUtils.TYPE_PLAINTEXT,
             ],
             Ci.nsIClipboard.kGlobalClipboard
           )
@@ -1049,7 +1049,7 @@ PlacesController.prototype = {
 
     function addURIData(index) {
       addData(PlacesUtils.TYPE_X_MOZ_URL, index);
-      addData(PlacesUtils.TYPE_UNICODE, index);
+      addData(PlacesUtils.TYPE_PLAINTEXT, index);
       addData(PlacesUtils.TYPE_HTML, index);
     }
 
@@ -1131,7 +1131,7 @@ PlacesController.prototype = {
       { type: PlacesUtils.TYPE_X_MOZ_PLACE, entries: [] },
       { type: PlacesUtils.TYPE_X_MOZ_URL, entries: [] },
       { type: PlacesUtils.TYPE_HTML, entries: [] },
-      { type: PlacesUtils.TYPE_UNICODE, entries: [] },
+      { type: PlacesUtils.TYPE_PLAINTEXT, entries: [] },
     ];
 
     // Avoid handling descendants of a copied node, the transactions take care
@@ -1264,7 +1264,7 @@ PlacesController.prototype = {
     [
       PlacesUtils.TYPE_X_MOZ_PLACE,
       PlacesUtils.TYPE_X_MOZ_URL,
-      PlacesUtils.TYPE_UNICODE,
+      PlacesUtils.TYPE_PLAINTEXT,
     ].forEach(type => xferable.addDataFlavor(type));
 
     Services.clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard);
@@ -1494,13 +1494,6 @@ var PlacesControllerDragHelper = {
       }
     }
 
-    // If no supported flavor is found, check if data includes text/plain
-    // contents.  If so, request them as text/unicode, a conversion will happen
-    // automatically.
-    if (aFlavors.contains("text/plain")) {
-      return PlacesUtils.TYPE_UNICODE;
-    }
-
     return null;
   },
 
@@ -1623,7 +1616,7 @@ var PlacesControllerDragHelper = {
 
     // Following flavors may contain duplicated data.
     let duplicable = new Map();
-    duplicable.set(PlacesUtils.TYPE_UNICODE, new Set());
+    duplicable.set(PlacesUtils.TYPE_PLAINTEXT, new Set());
     duplicable.set(PlacesUtils.TYPE_X_MOZ_URL, new Set());
 
     // Collect all data from the DataTransfer before processing it, as the

diff --git a/browser/components/places/tests/browser/browser_toolbar_drop_text.js b/browser/components/places/tests/browser/browser_toolbar_drop_text.js
@@ -133,7 +133,7 @@ add_task(async function test() {
   };
 
   // Simulate a bookmark drop for all of the mime types and effects.
-  let mimeTypes = ["text/plain", "text/unicode", "text/x-moz-url"];
+  let mimeTypes = ["text/plain", "text/x-moz-url"];
   let effects = ["move", "copy", "link"];
   for (let effect of effects) {
     for (let mimeType of mimeTypes) {

diff --git a/browser/components/textrecognition/tests/browser/head.js b/browser/components/textrecognition/tests/browser/head.js
@@ -19,11 +19,11 @@ function getTextFromClipboard() {
     Ci.nsITransferable
   );
   transferable.init(window.docShell.QueryInterface(Ci.nsILoadContext));
-  transferable.addDataFlavor("text/unicode");
+  transferable.addDataFlavor("text/plain");
   Services.clipboard.getData(transferable, Services.clipboard.kGlobalClipboard);
 
   const results = {};
-  transferable.getTransferData("text/unicode", results);
+  transferable.getTransferData("text/plain", results);
   return results.value.QueryInterface(Ci.nsISupportsString)?.data ?? "";
 }
 

diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -3604,7 +3604,7 @@ export class UrlbarInput {
     let title = this.window.gBrowser.contentTitle || href;
 
     event.dataTransfer.setData("text/x-moz-url", `${href}\n${title}`);
-    event.dataTransfer.setData("text/unicode", href);
+    event.dataTransfer.setData("text/plain", href);
     event.dataTransfer.setData("text/html", `<a href="${href}">${title}</a>`);
     event.dataTransfer.effectAllowed = "copyLink";
     event.stopPropagation();
@@ -3709,7 +3709,7 @@ function getDroppableData(event) {
     }
   }
   // Handle as text.
-  return event.dataTransfer.getData("text/unicode");
+  return event.dataTransfer.getData("text/plain");
 }
 
 /**

diff --git a/browser/components/urlbar/tests/browser/browser_primary_selection_safe_on_new_tab.js b/browser/components/urlbar/tests/browser/browser_primary_selection_safe_on_new_tab.js
@@ -60,7 +60,7 @@ add_task(async function() {
   }
 
   let primaryAsText = SpecialPowers.getClipboardData(
-    "text/unicode",
+    "text/plain",
     SpecialPowers.Ci.nsIClipboard.kSelectionClipboard
   );
   Assert.equal(primaryAsText, TEXT_FOR_PRIMARY);

diff --git a/browser/components/urlbar/tests/browser/browser_unitConversion.js b/browser/components/urlbar/tests/browser/browser_unitConversion.js
@@ -60,7 +60,7 @@ add_task(async function test_selectByKey() {
 
 function assertClipboard() {
   Assert.equal(
-    SpecialPowers.getClipboardData("text/unicode"),
+    SpecialPowers.getClipboardData("text/plain"),
     "100 cm",
     "The result of conversion is copied to clipboard"
   );

diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_selection.js b/browser/components/urlbar/tests/browser/browser_urlbar_selection.js
@@ -83,7 +83,7 @@ function checkPrimarySelection(expectedVal = "") {
     )
   ) {
     let primaryAsText = SpecialPowers.getClipboardData(
-      "text/unicode",
+      "text/plain",
       SpecialPowers.Ci.nsIClipboard.kSelectionClipboard
     );
     Assert.equal(primaryAsText, expectedVal);

diff --git a/devtools/client/debugger/test/mochitest/browser_dbg-features-source-tree.js b/devtools/client/debugger/test/mochitest/browser_dbg-features-source-tree.js
@@ -110,7 +110,7 @@ add_task(async function testSimpleSourcesWithManualClickExpand() {
   info("Test the copy to clipboard context menu");
   const mathMinTreeNode = findSourceNodeWithText(dbg, "math.min.js");
   await triggerCopySourceContextMenu(dbg, mathMinTreeNode);
-  const clipboardData = SpecialPowers.getClipboardData("text/unicode");
+  const clipboardData = SpecialPowers.getClipboardData("text/plain");
   is(
     clipboardData,
     EXAMPLE_URL + "math.min.js",

diff --git a/devtools/client/inspector/changes/test/browser_changes_copy_all_changes.js b/devtools/client/inspector/changes/test/browser_changes_copy_all_changes.js
@@ -48,6 +48,6 @@ add_task(async function() {
 });
 
 function checkClipboardData(expected) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   return decodeURIComponent(actual).trim() === expected.trim();
 }
diff --git a/devtools/client/inspector/changes/test/browser_changes_copy_declaration.js b/devtools/client/inspector/changes/test/browser_changes_copy_declaration.js
@@ -62,6 +62,6 @@ add_task(async function() {
 });
 
 function checkClipboardData(expected) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   return actual.trim() === expected.trim();
 }
diff --git a/devtools/client/inspector/changes/test/browser_changes_copy_rule.js b/devtools/client/inspector/changes/test/browser_changes_copy_rule.js
@@ -59,6 +59,6 @@ add_task(async function() {
 });
 
 function checkClipboardData(expected) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   return actual.trim() === expected.trim();
 }
diff --git a/devtools/client/inspector/computed/test/head.js b/devtools/client/inspector/computed/test/head.js
@@ -237,7 +237,7 @@ async function copySomeTextAndCheckClipboard(view, positions, expectedPattern) {
 }
 
 function checkClipboard(expectedPattern) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   const expectedRegExp = new RegExp(expectedPattern, "g");
   return expectedRegExp.test(actual);
 }
@@ -249,7 +249,7 @@ function failClipboardCheck(expectedPattern) {
   expectedPattern = expectedPattern.replace(/\\\(/g, "(");
   expectedPattern = expectedPattern.replace(/\\\)/g, ")");
 
-  let actual = SpecialPowers.getClipboardData("text/unicode");
+  let actual = SpecialPowers.getClipboardData("text/plain");
 
   // Trim the right hand side of our strings. This is because expectedPattern
   // accounts for windows sometimes adding a newline to our copied data.

diff --git a/devtools/client/inspector/rules/test/browser_rules_copy_styles.js b/devtools/client/inspector/rules/test/browser_rules_copy_styles.js
@@ -330,7 +330,7 @@ async function disableProperty(view, index) {
 }
 
 function checkClipboardData(expectedPattern) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   const expectedRegExp = new RegExp(expectedPattern, "g");
   return expectedRegExp.test(actual);
 }
@@ -342,7 +342,7 @@ function failedClipboard(expectedPattern) {
   expectedPattern = expectedPattern.replace(/\\\(/g, "(");
   expectedPattern = expectedPattern.replace(/\\\)/g, ")");
 
-  let actual = SpecialPowers.getClipboardData("text/unicode");
+  let actual = SpecialPowers.getClipboardData("text/plain");
 
   // Trim the right hand side of our strings. This is because expectedPattern
   // accounts for windows sometimes adding a newline to our copied data.

diff --git a/devtools/client/inspector/rules/test/browser_rules_select-and-copy-styles.js b/devtools/client/inspector/rules/test/browser_rules_select-and-copy-styles.js
@@ -182,7 +182,7 @@ async function checkCopyEditorValue(view) {
 }
 
 function checkClipboardData(expectedPattern) {
-  const actual = SpecialPowers.getClipboardData("text/unicode");
+  const actual = SpecialPowers.getClipboardData("text/plain");
   const expectedRegExp = new RegExp(expectedPattern, "g");
   return expectedRegExp.test(actual);
 }
@@ -194,7 +194,7 @@ function failedClipboard(expectedPattern) {
   expectedPattern = expectedPattern.replace(/\\\(/g, "(");
   expectedPattern = expectedPattern.replace(/\\\)/g, ")");
 
-  let actual = SpecialPowers.getClipboardData("text/unicode");
+  let actual = SpecialPowers.getClipboardData("text/plain");
 
   // Trim the right hand side of our strings. This is because expectedPattern
   // accounts for windows sometimes adding a newline to our copied data.

diff --git a/devtools/client/inspector/test/browser_inspector_highlighter-eyedropper-clipboard.js b/devtools/client/inspector/test/browser_inspector_highlighter-eyedropper-clipboard.js
@@ -43,11 +43,11 @@ add_task(async function() {
   ok(true, "The eyedropper is now hidden");
 
   info("Check that the clipboard still contains the copied color");
-  is(SpecialPowers.getClipboardData("text/unicode"), "#ff0000");
+  is(SpecialPowers.getClipboardData("text/plain"), "#ff0000");
 
   info("Replace the clipboard content with another text");
   SpecialPowers.clipboardCopyString("not-a-color");
-  is(SpecialPowers.getClipboardData("text/unicode"), "not-a-color");
+  is(SpecialPowers.getClipboardData("text/plain"), "not-a-color");
 
   info("Click on the page again, check the clipboard was not updated");
   await BrowserTestUtils.synthesizeMouseAtCenter(
@@ -57,7 +57,7 @@ add_task(async function() {
   );
   // Wait 500ms because nothing is observable when the test is successful.
   await wait(500);
-  is(SpecialPowers.getClipboardData("text/unicode"), "not-a-color");
+  is(SpecialPowers.getClipboardData("text/plain"), "not-a-color");
 
   finalize();
 });
diff --git a/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
@@ -155,7 +155,7 @@ async function testClearedRequests({ tab, monitor, toolbox }) {
     connector
   );
 
-  const jsonString = SpecialPowers.getClipboardData("text/unicode");
+  const jsonString = SpecialPowers.getClipboardData("text/plain");
   const har = JSON.parse(jsonString);
   is(har.log.entries.length, 2, "There must be two requests");
   is(
@@ -233,6 +233,6 @@ async function reloadAndCopyAllAsHar({
     connector
   );
 
-  const jsonString = SpecialPowers.getClipboardData("text/unicode");
+  const jsonString = SpecialPowers.getClipboardData("text/plain");
   return JSON.parse(jsonString);
 }
diff --git a/devtools/shared/platform/clipboard.js b/devtools/shared/platform/clipboard.js
@@ -15,12 +15,12 @@ function copyString(string) {
 }
 
 /**
- * Retrieve the current clipboard data matching the flavor "text/unicode".
+ * Retrieve the current clipboard data matching the flavor "text/plain".
  *
  * @return {String} Clipboard text content, null if no text clipboard data is available.
  */
 function getText() {
-  const flavor = "text/unicode";
+  const flavor = "text/plain";
 
   const xferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(
     Ci.nsITransferable