Commit 1c944daf authored by ma1's avatar ma1 Committed by Pier Angelo Vendrame
Browse files

BB 41918: Option to reuse last window size when letterboxing is enabled.

parent ffab6a05
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ pref("privacy.resistFingerprinting.letterboxing", true);
pref("privacy.resistFingerprinting.letterboxing.vcenter", true);
// tor-browser#41917: Letterboxing gradient background
pref("privacy.resistFingerprinting.letterboxing.gradient", true);
// tor-browser#41918: Should we reuse last window sizes if letterboxing is enabled
pref("privacy.resistFingerprinting.letterboxing.rememberSize", false);
// Enforce Network Information API as disabled
pref("dom.netinfo.enabled", false);
pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status
+5 −0
Original line number Diff line number Diff line
@@ -1874,6 +1874,11 @@ BrowserGlue.prototype = {
      return;
    }

    // We don't want to mess up with RFP new window / letterboxing machinery.
    if (Services.prefs.getBoolPref("privacy.resistFingerprinting", false)) {
      return;
    }

    let store = Services.xulStore;
    let getValue = attr =>
      store.getValue(AppConstants.BROWSER_CHROME_URL, "main-window", attr);
+12 −0
Original line number Diff line number Diff line
@@ -2754,6 +2754,18 @@ void nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting(
  *aOutputHeight = resultHeight;
}

bool nsContentUtils::ShouldRoundWindowSizeForResistingFingerprinting() {
  return !(
      Preferences::GetBool("privacy.resistFingerprinting.letterboxing",
                           false) &&
      // We want to round window size at least once in the browser's life time:
      // AppWindow::ForceRoundedDimensions() will set this preference to true.
      Preferences::GetBool(
          "privacy.resistFingerprinting.letterboxing.didForceSize", false) &&
      Preferences::GetBool(
          "privacy.resistFingerprinting.letterboxing.rememberSize", false));
}

bool nsContentUtils::ThreadsafeIsCallerChrome() {
  return NS_IsMainThread() ? IsCallerChrome()
                           : IsCurrentThreadRunningChromeWorker();
+4 −0
Original line number Diff line number Diff line
@@ -407,6 +407,10 @@ class nsContentUtils {
      bool aSetOuterWidth, bool aSetOuterHeight, int32_t* aOutputWidth,
      int32_t* aOutputHeight);

  // Tell if we actually want to round size of new windows for RFP,
  // depending on letterboxing status and user's preference.
  static bool ShouldRoundWindowSizeForResistingFingerprinting();

  /**
   * Returns the parent node of aChild crossing document boundaries, but skips
   * any cross-process parent frames and continues with the nearest in-process
+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ const kPrefLetterboxingVcenter =
  "privacy.resistFingerprinting.letterboxing.vcenter";
const kPrefLetterboxingGradient =
  "privacy.resistFingerprinting.letterboxing.gradient";
const kPrefLetterboxingDidForceSize =
  "privacy.resistFingerprinting.letterboxing.didForceSize";

const kTopicDOMWindowOpened = "domwindowopened";

@@ -142,6 +144,7 @@ class _RFPHelper {
  _handlePrefChanged(data) {
    switch (data) {
      case kPrefResistFingerprinting:
        Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize);
        this._handleResistFingerprintingChanged();
        break;
      case kPrefSpoofEnglish:
@@ -149,6 +152,8 @@ class _RFPHelper {
        this._handleSpoofEnglishChanged();
        break;
      case kPrefLetterboxing:
        Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize);
      // fall-through
      case kPrefLetterboxingVcenter:
      case kPrefLetterboxingGradient:
        this._handleLetterboxingPrefChanged();
Loading