Better scaling of the tab preview panel with privacy.resistFingerprin…

…ting=true #3698
piroor · Jan 14, 2025 · 22c8905 · 22c8905
1 parent 04cf13b
commit 22c8905
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/webextensions/resources/module/tab-preview-frame.js b/webextensions/resources/module/tab-preview-frame.js
@@ -421,7 +421,7 @@ function preparePanel() {
   panel = createdPanel;
 }
 
-function updatePanel({ previewTabId, title, url, tooltipHtml, hasPreview, previewURL, previewTabRect, offsetTop, align, rtl, scale, logging, animation, backgroundColor, borderColor, color } = {}) {
+function updatePanel({ previewTabId, title, url, tooltipHtml, hasPreview, previewURL, previewTabRect, offsetTop, align, rtl, scale, logging, animation, backgroundColor, borderColor, color, widthInOuterWorld } = {}) {
   if (!panel)
     return;
 
@@ -432,7 +432,7 @@ function updatePanel({ previewTabId, title, url, tooltipHtml, hasPreview, previe
     hasPreview = hasLoadablePreviewURL;
 
   if (logging)
-    console.log('updatePanel ', { previewTabId, title, url, tooltipHtml, hasPreview, previewURL, previewTabRect, offsetTop, align, rtl, scale });
+    console.log('updatePanel ', { previewTabId, title, url, tooltipHtml, hasPreview, previewURL, previewTabRect, offsetTop, align, rtl, scale, widthInOuterWorld });
 
   panel.classList.add('updating');
   panel.classList.toggle('animation', animation);
@@ -452,13 +452,23 @@ function updatePanel({ previewTabId, title, url, tooltipHtml, hasPreview, previe
   // from both the sidebar and the content area, because all contents
   // of the browser window can be scaled on a high-DPI display by the
   // platform.
-  scale = window.devicePixelRatio * (scale || 1);
+  const isResistFingerprintingMode = window.mozInnerScreenY == 0 && window.screenY == 0;
+  const devicePixelRatio = (widthInOuterWorld || window.innerWidth) / window.innerWidth;
+  if (logging)
+    console.log('updatePanel: isResistFingerprintingMode ', isResistFingerprintingMode, { devicePixelRatio });
+  // But window.devicePixelRatio is not available if privacy.resistFingerprinting=true,
+  // thus we need to calculate it based on tabs.Tab.width.
+  scale = devicePixelRatio * (scale || 1);
   document.documentElement.style.setProperty('--tab-preview-panel-scale', scale);
   const panelWidth = Math.min(window.innerWidth, BASE_PANEL_WIDTH / scale);
   panel.style.setProperty('--panel-width', `${panelWidth}px`);
 
-  const offsetFromWindowEdge = (window.mozInnerScreenY - window.screenY) * scale;
-  const sidebarContentsOffset = (offsetTop - offsetFromWindowEdge) / scale;
+  const offsetFromWindowEdge = isResistFingerprintingMode ?
+    0 :
+    (window.mozInnerScreenY - window.screenY) * scale;
+  const sidebarContentsOffset = isResistFingerprintingMode ?
+    0 :
+    (offsetTop - offsetFromWindowEdge) / scale;
 
   if (previewTabRect) {
     const panelTopEdge = windowId ? previewTabRect.bottom : previewTabRect.top;

diff --git a/webextensions/sidebar/tab-preview-tooltip.js b/webextensions/sidebar/tab-preview-tooltip.js
@@ -278,18 +278,21 @@ async function sendTabPreviewMessage(tabId, message, deferredResultResolver) {
 
   let frameId;
   let loadedInfo;
+  let rawTab;
   try {
-    const [gotFrameId, gotLoadedInfo] = await Promise.all([
+    const [gotFrameId, gotLoadedInfo, gotRawTab] = await Promise.all([
       browser.tabs.sendMessage(tabId, {
         type: 'treestyletab:ask-tab-preview-frame-id',
       }).catch(_error => {}),
       DIRECT_PANEL_AVAILABLE_URLS_MATCHER.test(tab.url) && browser.tabs.sendMessage(tabId, {
         type: 'treestyletab:ask-tab-preview-frame-loaded',
         tabId,
       }).catch(_error => {}),
+      browser.tabs.get(tabId),
     ]);
     frameId = gotFrameId;
     loadedInfo = gotLoadedInfo;
+    rawTab = gotRawTab;
     log(`sendTabPreviewMessage(${message.type}${retrying ? ', retrying' : ''}): response from the tab: `, { frameId, loadedInfo });
     if (!frameId &&
         (!loadedInfo ||
@@ -359,6 +362,7 @@ async function sendTabPreviewMessage(tabId, message, deferredResultResolver) {
       ...message,
       ...TabPreviewFrame.getColors(),
       ...(promisedPreviewURL ? { previewURL: null } : {}),
+      widthInOuterWorld: rawTab.width,
       animation: shouldApplyAnimation(),
       logging: configs.logFor['sidebar/tab-preview-tooltip'] && configs.debug,
     }, frameId ? { frameId } : {});
@@ -375,6 +379,7 @@ async function sendTabPreviewMessage(tabId, message, deferredResultResolver) {
           ...message,
           previewURL,
           ...TabPreviewFrame.getColors(),
+          widthInOuterWorld: rawTab.width,
           animation: shouldApplyAnimation(),
           logging: configs.logFor['sidebar/tab-preview-tooltip'] && configs.debug,
         }, frameId ? { frameId } : {});