From 6dc4143615f7b7d8e015656776e7ea6cbf392b84 Mon Sep 17 00:00:00 2001
From: hackademix <giorgio@maone.net>
Date: Thu, 10 Nov 2022 22:59:17 +0100
Subject: [PATCH] Bug 41434: Letterboxing, improve logging.
---
.../resistfingerprinting/RFPHelper.sys.mjs | 61 ++++---------------
1 file changed, 11 insertions(+), 50 deletions(-)
diff --git a/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs b/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
index 5d25896554efb..31eacc47dbe47 100644
--- a/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
+++ b/toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
@@ -422,8 +422,8 @@ class _RFPHelper {
* content viewport.
*/
async _roundContentView(aBrowser, isNewTab = false) {
- let logId = Math.random();
- log("_roundContentView[" + logId + "]");
+ let logPrefix = `_roundContentView[${Math.random()}]`;
+ log(logPrefix);
aBrowser.classList.remove("exclude-letterboxing");
let win = aBrowser.ownerGlobal;
let browserContainer = aBrowser
@@ -442,17 +442,9 @@ class _RFPHelper {
);
log(
- "_roundContentView[" +
- logId +
- "] contentWidth=" +
- contentWidth +
- " contentHeight=" +
- contentHeight +
- " containerWidth=" +
- containerWidth +
- " containerHeight=" +
- containerHeight +
- " "
+ `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${
+ isNewTab ? " (new tab)." : "."
+ }`
);
if (containerWidth === 0) {
@@ -462,16 +454,7 @@ class _RFPHelper {
const calcMargins = (aWidth, aHeight) => {
let result;
- log(
- "_roundContentView[" +
- logId +
- "] calcMargins(" +
- aWidth +
- ", " +
- aHeight +
- ")"
- );
-
+ log(`${logPrefix} calcMargins(${aWidth}, ${aHeight})`);
// If the set is empty, we will round the content with the default
// stepping size.
if (!this._letterboxingDimensions.length) {
@@ -480,16 +463,7 @@ class _RFPHelper {
height: this.steppedRange(aHeight),
};
log(
- "_roundContentView[" +
- logId +
- "] calcMargins(" +
- aWidth +
- ", " +
- aHeight +
- ") = " +
- result.width +
- " x " +
- result.height
+ `${logPrefix} calcMargins(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}`
);
return result;
}
@@ -530,16 +504,7 @@ class _RFPHelper {
}
log(
- "_roundContentView[" +
- logId +
- "] calcMargins(" +
- aWidth +
- ", " +
- aHeight +
- ") = " +
- result.width +
- " x " +
- result.height
+ `${logPrefix} calcMargins(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}`
);
return result;
};
@@ -595,12 +560,10 @@ class _RFPHelper {
// If the size of the content is already quantized, we do nothing.
if (!marginChanges.length) {
- log("_roundContentView[" + logId + "] is_rounded == true");
+ log(`${logPrefix} is_rounded == true`);
if (this._isLetterboxingTesting) {
log(
- "_roundContentView[" +
- logId +
- "] is_rounded == true test:letterboxing:update-margin-finish"
+ `${logPrefix} is_rounded == true test:letterboxing:update-margin-finish`
);
Services.obs.notifyObservers(
null,
@@ -610,9 +573,7 @@ class _RFPHelper {
return;
}
- log(
- "_roundContentView[" + logId + "] setting margins to " + marginStyleString
- );
+ log(`${logPrefix} setting margins to ${marginStyleString}`);
// One cannot (easily) control the color of a margin unfortunately.
// An initial attempt to use a border instead of a margin resulted
// in offset event dispatching; so for now we use a colorless margin.
--
GitLab