Bug 1902341 - Increase screenshots fallback filename length for Windows. r=sfoster

marco-c · marco-c · commit 4b1b1b8bb647 · 2024-06-16T12:52:53.000Z
Differential Revision: https://phabricator.services.mozilla.com/D213609 UltraBlame original commit: cadbd1d64feb46499084bde1362c1b43904e9958
diff --git a/browser/components/screenshots/fileHelpers.mjs b/browser/components/screenshots/fileHelpers.mjs
@@ -137,6 +137,16 @@ MAX_PATH_LENGTH_WINDOWS
 ;
 /
 /
+Windows
+allows
+255
+character
+filenames
+in
+the
+filepicker
+/
+/
 macOS
 has
 a
@@ -163,12 +173,6 @@ MAX_FILENAME_LENGTH
 =
 255
 ;
-export
-const
-FALLBACK_MAX_FILENAME_LENGTH
-=
-64
-;
 ChromeUtils
 .
 defineESModuleGetters
@@ -302,14 +306,15 @@ directory
 exists
 .
 Otherwise
-we
-just
-return
-a
+Windows
+allows
 *
-fallback
-filename
-length
+255
+character
+filenames
+in
+the
+filepicker
 .
 *
 *
@@ -346,6 +351,10 @@ null
 {
 if
 (
+!
+downloadDir
+|
+|
 AppConstants
 .
 platform
@@ -361,11 +370,6 @@ return
 MAX_FILENAME_LENGTH
 ;
 }
-if
-(
-downloadDir
-)
-{
 return
 MAX_PATH_LENGTH_WINDOWS
 -
@@ -376,10 +380,6 @@ length
 1
 ;
 }
-return
-FALLBACK_MAX_FILENAME_LENGTH
-;
-}
 /
 *
 *

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,16 @@ MAX_PATH_LENGTH_WINDOWS`
`137`	`137`	`;`
`138`	`138`	`/`
`139`	`139`	`/`
	`140`	`+Windows`
	`141`	`+allows`
	`142`	`+255`
	`143`	`+character`
	`144`	`+filenames`
	`145`	`+in`
	`146`	`+the`
	`147`	`+filepicker`
	`148`	`+/`
	`149`	`+/`
`140`	`150`	`macOS`
`141`	`151`	`has`
`142`	`152`	`a`
`@@ -163,12 +173,6 @@ MAX_FILENAME_LENGTH`
`163`	`173`	`=`
`164`	`174`	`255`
`165`	`175`	`;`
`166`		`-export`
`167`		`-const`
`168`		`-FALLBACK_MAX_FILENAME_LENGTH`
`169`		`-=`
`170`		`-64`
`171`		`-;`
`172`	`176`	`ChromeUtils`
`173`	`177`	`.`
`174`	`178`	`defineESModuleGetters`
`@@ -302,14 +306,15 @@ directory`
`302`	`306`	`exists`
`303`	`307`	`.`
`304`	`308`	`Otherwise`
`305`		`-we`
`306`		`-just`
`307`		`-return`
`308`		`-a`
	`309`	`+Windows`
	`310`	`+allows`
`309`	`311`	`*`
`310`		`-fallback`
`311`		`-filename`
`312`		`-length`
	`312`	`+255`
	`313`	`+character`
	`314`	`+filenames`
	`315`	`+in`
	`316`	`+the`
	`317`	`+filepicker`
`313`	`318`	`.`
`314`	`319`	`*`
`315`	`320`	`*`
`@@ -346,6 +351,10 @@ null`
`346`	`351`	`{`
`347`	`352`	`if`
`348`	`353`	`(`
	`354`	`+!`
	`355`	`+downloadDir`
	`356`	`+\|`
	`357`	`+\|`
`349`	`358`	`AppConstants`
`350`	`359`	`.`
`351`	`360`	`platform`
`@@ -361,11 +370,6 @@ return`
`361`	`370`	`MAX_FILENAME_LENGTH`
`362`	`371`	`;`
`363`	`372`	`}`
`364`		`-if`
`365`		`-(`
`366`		`-downloadDir`
`367`		`-)`
`368`		`-{`
`369`	`373`	`return`
`370`	`374`	`MAX_PATH_LENGTH_WINDOWS`
`371`	`375`	`-`
`@@ -376,10 +380,6 @@ length`
`376`	`380`	`1`
`377`	`381`	`;`
`378`	`382`	`}`
`379`		`-return`
`380`		`-FALLBACK_MAX_FILENAME_LENGTH`
`381`		`-;`
`382`		`-}`
`383`	`383`	`/`
`384`	`384`	`*`
`385`	`385`	`*`