- tor-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! MB 1: Mullvad Browser branding
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 8abd3ea6 by Pier Angelo Vendrame at 2024-04-08T20:15:44+00:00 fixup! MB 1: Mullvad Browser branding Bug 42490: Write the browser logo SVG also outside of omni.ja. For Mullvad Browser, we have to add this also to the various moz.build that are inside each branding directory, because we do not call FirefoxBranding for them. - - - - - 3 changed files: - browser/branding/mb-alpha/moz.build - browser/branding/mb-nightly/moz.build - browser/branding/mb-release/moz.build Changes: ===================================== browser/branding/mb-alpha/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', ===================================== browser/branding/mb-nightly/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', ===================================== browser/branding/mb-release/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8ab… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8ab… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 2d505062 by Pier Angelo Vendrame at 2024-04-08T20:10:54+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2d5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2d5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 621f7857 by Pier Angelo Vendrame at 2024-04-08T20:10:21+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/621f785… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/621f785… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4255b354 by Pier Angelo Vendrame at 2024-04-08T19:55:24+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4255b35… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4255b35… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.10.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new branch tor-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: eabcfada by hackademix at 2024-04-08T19:53:21+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabcfad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabcfad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_10_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new tag FIREFOX_115_10_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 76baafb8 by hackademix at 2024-04-08T19:52:12+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f2f79405 by hackademix at 2024-04-08T19:10:15+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2f7940… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2f7940… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 3 commits: fixup! Bug 40209: Implement Basic Crypto Safety
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 3ddbe28a by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 58d32687 by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Tor Browser strings Bug 42202: Migrate crypto safety strings to Fluent. - - - - - bb6f56ad by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Tor Browser localization migration scripts. Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 5 changed files: - browser/actors/CryptoSafetyParent.jsm - browser/locales/en-US/browser/tor-browser.ftl - − browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties - browser/locales/jar.mn - + tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py Changes: ===================================== browser/actors/CryptoSafetyParent.jsm ===================================== @@ -20,17 +20,8 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/TorDomainIsolator.jsm" ); -XPCOMUtils.defineLazyGetter(lazy, "cryptoSafetyBundle", () => { - return Services.strings.createBundle( - "chrome://browser/locale/cryptoSafetyPrompt.properties" - ); -}); - -// en-US fallback in case a locale is missing a string. -XPCOMUtils.defineLazyGetter(lazy, "fallbackCryptoSafetyBundle", () => { - return Services.strings.createBundle( - "resource:///chrome/en-US/locale/browser/cryptoSafetyPrompt.properties" - ); +ChromeUtils.defineLazyGetter(lazy, "CryptoStrings", function () { + return new Localization(["browser/tor-browser.ftl"]); }); XPCOMUtils.defineLazyPreferenceGetter( @@ -40,26 +31,8 @@ XPCOMUtils.defineLazyPreferenceGetter( true // Defaults to true. ); -/** - * Get a formatted string from the locale's bundle, or the en-US bundle if the - * string is missing. - * - * @param {string} name - The string's name. - * @param {string[]} [args] - Positional arguments to pass to the format string, - * or leave empty if none are needed. - * - * @returns {string} - The formatted string. - */ -function getString(name, args = []) { - try { - return lazy.cryptoSafetyBundle.formatStringFromName(name, args); - } catch { - return lazy.fallbackCryptoSafetyBundle.formatStringFromName(name, args); - } -} - class CryptoSafetyParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if ( !lazy.isCryptoSafetyEnabled || aMessage.name !== "CryptoSafety:CopiedText" @@ -72,14 +45,25 @@ class CryptoSafetyParent extends JSWindowActorParent { address = `${address.substring(0, 32)}…`; } + const [titleText, bodyText, reloadText, dismissText] = + await lazy.CryptoStrings.formatValues([ + { id: "crypto-safety-prompt-title" }, + { + id: "crypto-safety-prompt-body", + args: { address, host: aMessage.data.host }, + }, + { id: "crypto-safety-prompt-reload-button" }, + { id: "crypto-safety-prompt-dismiss-button" }, + ]); + const buttonPressed = Services.prompt.confirmEx( this.browsingContext.topChromeWindow, - getString("cryptoSafetyPrompt.cryptoTitle"), - getString("cryptoSafetyPrompt.cryptoBody", [address, aMessage.data.host]), + titleText, + bodyText, Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1, - getString("cryptoSafetyPrompt.primaryAction"), - getString("cryptoSafetyPrompt.secondaryAction"), + reloadText, + dismissText, null, null, {} ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -382,3 +382,12 @@ tor-circuit-panel-new-button = New Tor circuit for this site tor-circuit-panel-new-button-description-guard = Your guard node may not change # Shown when the first node in the circuit is a bridge node. tor-circuit-panel-new-button-description-bridge = Your bridge may not change + +## This dialog is shown when copying a suspected cryptocurrency address from a plain HTTP website. + +crypto-safety-prompt-title = Cryptocurrency address copied from an insecure website +# $address (String) - The cryptocurrency address, possibly truncated. +# $host (String) - The website host the address was copied from. +crypto-safety-prompt-body = The copied text ({ $address }) appears to be a cryptocurrency address. Since the connection to { $host } is not secure, the address may have been modified and should not be trusted. You can try establishing a secure connection by reconnecting with a new circuit. +crypto-safety-prompt-reload-button = Reload Tab with a New Circuit +crypto-safety-prompt-dismiss-button = Dismiss Warning ===================================== browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties deleted ===================================== @@ -1,19 +0,0 @@ -# Copyright (c) 2022, The Tor Project, Inc. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -cryptoSafetyPrompt.cryptoTitle=Cryptocurrency address copied from an insecure website -# LOCALIZATION NOTE: -# %1$S is the copied cryptocurrency address. -# %2$S is the website host. -cryptoSafetyPrompt.cryptoBody=The copied text (%1$S) appears to be a cryptocurrency address. Since the connection to %2$S is not secure, the address may have been modified and should not be trusted. You can try establishing a secure connection by reconnecting with a new circuit. -# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address. -cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. -cryptoSafetyPrompt.whatCanHeading=What can you do about it? -cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. -cryptoSafetyPrompt.learnMore=Learn more -cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit -cryptoSafetyPrompt.primaryActionAccessKey=R -cryptoSafetyPrompt.secondaryAction=Dismiss Warning -cryptoSafetyPrompt.secondaryActionAccessKey=B ===================================== browser/locales/jar.mn ===================================== @@ -33,5 +33,4 @@ locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) - locale/browser/cryptoSafetyPrompt.properties (%chrome/browser/cryptoSafetyPrompt.properties) % locale browser-region @AB_CD@ %locale/browser-region/ ===================================== tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py ===================================== @@ -0,0 +1,34 @@ +import fluent.syntax.ast as FTL +from fluent.migrate.helpers import VARIABLE_REFERENCE, transforms_from +from fluent.migrate.transforms import REPLACE + + +def migrate(ctx): + legacy_path = "cryptoSafetyPrompt.properties" + + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + transforms_from( + """ +crypto-safety-prompt-title = { COPY(path, "cryptoSafetyPrompt.cryptoTitle") } +crypto-safety-prompt-reload-button = { COPY(path, "cryptoSafetyPrompt.primaryAction") } +crypto-safety-prompt-dismiss-button = { COPY(path, "cryptoSafetyPrompt.secondaryAction") } +""", + path=legacy_path, + ) + + [ + # Replace "%1$S" and "%2$S" with "{ $address }" and "{ $host }" + FTL.Message( + id=FTL.Identifier("crypto-safety-prompt-body"), + value=REPLACE( + legacy_path, + "cryptoSafetyPrompt.cryptoBody", + { + "%1$S": VARIABLE_REFERENCE("address"), + "%2$S": VARIABLE_REFERENCE("host"), + }, + ), + ), + ], + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/27fee8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/27fee8… You're receiving this email because of your account on gitlab.torproject.org.

1 0