Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/devtools/client/shared/screenshot.js b/devtools/client/shared/screenshot.js
index ca746f66e7..4031708293 100644
--- a/devtools/client/shared/screenshot.js
+++ b/devtools/client/shared/screenshot.js
@@ -327,9 +327,9 @@ function saveToClipboard(base64URI) {
 let _outputDirectory = null;
 
 /**
- * Returns the default directory for screenshots.
- * If a specific directory for screenshots is not defined,
- * it falls back to the system downloads directory.
+ * Returns the default directory for DevTools screenshots.
+ * For consistency with the Firefox Screenshots feature, this will default to
+ * the preferred downloads directory.
  *
  * @return {Promise<String>} Resolves the path as a string
  */
@@ -338,13 +338,7 @@ async function getOutputDirectory() {
     return _outputDirectory;
   }
 
-  try {
-    // This will throw if there is not a screenshot directory set for the platform
-    _outputDirectory = Services.dirsvc.get("Scrnshts", Ci.nsIFile).path;
-  } catch (e) {
-    _outputDirectory = await lazy.Downloads.getPreferredDownloadsDirectory();
-  }
-
+  _outputDirectory = await lazy.Downloads.getPreferredDownloadsDirectory();
   return _outputDirectory;
 }