Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mullvad Browser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dan Ballard
Mullvad Browser
Commits
6dc41436
Commit
6dc41436
authored
2 years ago
by
ma1
Committed by
Pier Angelo Vendrame
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Bug 41434: Letterboxing, improve logging.
parent
739023d4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
+11
-50
11 additions, 50 deletions
toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
with
11 additions
and
50 deletions
toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
+
11
−
50
View file @
6dc41436
...
...
@@ -422,8 +422,8 @@ class _RFPHelper {
* content viewport.
*/
async
_roundContentView
(
aBrowser
,
isNewTab
=
false
)
{
let
log
Id
=
Math
.
random
();
log
(
"
_roundContentView[
"
+
logId
+
"
]
"
);
let
log
Prefix
=
`_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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment