Backed out changeset da5c71190673 (bug 1773813) for causing build bustages CLOSED TREE

Author: Norisz Fay

docshell/base/nsDocShell.cpp

@@ -4641,14 +4641,20 @@ nsDocShell::Destroy() {
   return NS_OK;
 }
 
-double nsDocShell::GetWidgetCSSToDeviceScale() {
+NS_IMETHODIMP
+nsDocShell::GetUnscaledDevicePixelsPerCSSPixel(double* aScale) {
   if (mParentWidget) {
-    return mParentWidget->GetDefaultScale().scale;
+    *aScale = mParentWidget->GetDefaultScale().scale;
+    return NS_OK;
   }
-  if (nsCOMPtr<nsIBaseWindow> ownerWindow = do_QueryInterface(mTreeOwner)) {
-    return ownerWindow->GetWidgetCSSToDeviceScale();
+
+  nsCOMPtr<nsIBaseWindow> ownerWindow(do_QueryInterface(mTreeOwner));
+  if (ownerWindow) {
+    return ownerWindow->GetUnscaledDevicePixelsPerCSSPixel(aScale);
   }
-  return 1.0;
+
+  *aScale = 1.0;
+  return NS_OK;
 }
 
 NS_IMETHODIMP

docshell/base/nsDocShellTreeOwner.cpp

@@ -552,8 +552,14 @@ nsDocShellTreeOwner::Destroy() {
   return NS_ERROR_NULL_POINTER;
 }
 
-double nsDocShellTreeOwner::GetWidgetCSSToDeviceScale() {
-  return mWebBrowser ? mWebBrowser->GetWidgetCSSToDeviceScale() : 1.0;
+NS_IMETHODIMP
+nsDocShellTreeOwner::GetUnscaledDevicePixelsPerCSSPixel(double* aScale) {
+  if (mWebBrowser) {
+    return mWebBrowser->GetUnscaledDevicePixelsPerCSSPixel(aScale);
+  }
+
+  *aScale = 1.0;
+  return NS_OK;
 }
 
 NS_IMETHODIMP

dom/base/nsGlobalWindowInner.cpp

@@ -7518,37 +7518,53 @@ void nsGlobalWindowInner::SetReplaceableWindowCoord(
     if (innerWidthSpecified || innerHeightSpecified || outerWidthSpecified ||
         outerHeightSpecified) {
       nsCOMPtr<nsIBaseWindow> treeOwnerAsWin = outer->GetTreeOwnerWindow();
+      nsCOMPtr<nsIScreen> screen;
       nsCOMPtr<nsIScreenManager> screenMgr(
           do_GetService("@mozilla.org/gfx/screenmanager;1"));
+      int32_t winLeft = 0;
+      int32_t winTop = 0;
+      int32_t winWidth = 0;
+      int32_t winHeight = 0;
+      double scale = 1.0;
 
       if (treeOwnerAsWin && screenMgr) {
         // Acquire current window size.
-        //
-        // FIXME: This needs to account for full zoom like the outer window code
-        // does! Ideally move there?
-        auto cssScale = treeOwnerAsWin->UnscaledDevicePixelsPerCSSPixel();
-        LayoutDeviceIntRect devWinRect = treeOwnerAsWin->GetPositionAndSize();
-        CSSIntRect cssWinRect = RoundedToInt(devWinRect / cssScale);
+        treeOwnerAsWin->GetUnscaledDevicePixelsPerCSSPixel(&scale);
+        treeOwnerAsWin->GetPositionAndSize(&winLeft, &winTop, &winWidth,
+                                           &winHeight);
+        winLeft = NSToIntRound(winHeight / scale);
+        winTop = NSToIntRound(winWidth / scale);
+        winWidth = NSToIntRound(winWidth / scale);
+        winHeight = NSToIntRound(winHeight / scale);
 
         // Acquire content window size.
         CSSSize contentSize;
         outer->GetInnerSize(contentSize);
 
-        nsCOMPtr<nsIScreen> screen = screenMgr->ScreenForRect(RoundedToInt(
-            devWinRect / treeOwnerAsWin->DevicePixelsPerDesktopPixel()));
+        screenMgr->ScreenForRect(winLeft, winTop, winWidth, winHeight,
+                                 getter_AddRefs(screen));
+
         if (screen) {
           int32_t roundedValue = std::round(value);
           int32_t* targetContentWidth = nullptr;
           int32_t* targetContentHeight = nullptr;
+          int32_t screenWidth = 0;
+          int32_t screenHeight = 0;
+          int32_t chromeWidth = 0;
+          int32_t chromeHeight = 0;
           int32_t inputWidth = 0;
           int32_t inputHeight = 0;
           int32_t unused = 0;
 
-          CSSIntSize availScreenSize =
-              RoundedToInt(screen->GetAvailRect().Size() / cssScale);
+          // Get screen dimensions (in device pixels)
+          screen->GetAvailRect(&unused, &unused, &screenWidth, &screenHeight);
+          // Convert them to CSS pixels
+          screenWidth = NSToIntRound(screenWidth / scale);
+          screenHeight = NSToIntRound(screenHeight / scale);
 
           // Calculate the chrome UI size.
-          CSSIntSize chromeSize = cssWinRect.Size() - RoundedToInt(contentSize);
+          chromeWidth = winWidth - contentSize.width;
+          chromeHeight = winHeight - contentSize.height;
 
           if (innerWidthSpecified || outerWidthSpecified) {
             inputWidth = value;
@@ -7561,10 +7577,9 @@ void nsGlobalWindowInner::SetReplaceableWindowCoord(
           }
 
           nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting(
-              chromeSize.width, chromeSize.height, availScreenSize.width,
-              availScreenSize.height, inputWidth, inputHeight,
-              outerWidthSpecified, outerHeightSpecified, targetContentWidth,
-              targetContentHeight);
+              chromeWidth, chromeHeight, screenWidth, screenHeight, inputWidth,
+              inputHeight, outerWidthSpecified, outerHeightSpecified,
+              targetContentWidth, targetContentHeight);
           value = T(roundedValue);
         }
       }