diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 485bcbf62067..e879420910df 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -53,28 +53,6 @@ https_first_disabled = true [browser_roundedWindow_open_max_inner.js] [browser_roundedWindow_open_mid_inner.js] [browser_roundedWindow_open_min_inner.js] -[browser_roundedWindow_windowSetting_max_inner.js] -skip-if = - os == 'linux' && socketprocess_networking - os == "linux" && fission && !swgl # high frequency intermittent -[browser_roundedWindow_windowSetting_max_outer.js] -skip-if = - os == 'linux' && socketprocess_networking - os == "linux" && fission && !swgl # high frequency intermittent -[browser_roundedWindow_windowSetting_mid_inner.js] -skip-if = - os == 'linux' && socketprocess_networking - os == "linux" && fission && !swgl # high frequency intermittent -[browser_roundedWindow_windowSetting_mid_outer.js] -skip-if = os == "linux" && bits == 64 && os_version == "18.04" -[browser_roundedWindow_windowSetting_min_inner.js] -skip-if = - os == 'linux' && socketprocess_networking - os == "linux" && fission && !swgl # high frequency intermittent -[browser_roundedWindow_windowSetting_min_outer.js] -skip-if = - os == 'linux' && socketprocess_networking - os == "linux" && fission && !swgl # high frequency intermittent [browser_spoofing_keyboard_event.js] skip-if = (debug || asan) && os == "linux" && bits == 64 #Bug 1518179 [browser_timezone.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_inner.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_inner.js deleted file mode 100644 index c0147be3fc3e..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_inner.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.innerWidth/Height - * when fingerprinting resistance is enabled. This test is for maximum values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 1025, - settingHeight: 1050, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 9999, - settingHeight: 9999, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 999, - settingHeight: 999, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - ], - false -); diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_outer.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_outer.js deleted file mode 100644 index d06a55b5d238..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_max_outer.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.outerWidth/Height - * when fingerprinting resistance is enabled. This test is for maximum values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 1025, - settingHeight: 1050, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 9999, - settingHeight: 9999, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 999, - settingHeight: 999, - targetWidth: 1000, - targetHeight: 1000, - initWidth: 200, - initHeight: 100, - }, - ], - true -); diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_inner.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_inner.js deleted file mode 100644 index 097e911f4423..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_inner.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.innerWidth/Height - * when fingerprinting resistance is enabled. This test is for middle values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 600, - settingHeight: 600, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 599, - settingHeight: 599, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 401, - settingHeight: 501, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - ], - false -); diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_outer.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_outer.js deleted file mode 100644 index b50d30b33f0c..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_mid_outer.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.outerWidth/Height - * when fingerprinting resistance is enabled. This test is for middle values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 600, - settingHeight: 600, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 599, - settingHeight: 599, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - { - settingWidth: 401, - settingHeight: 501, - targetWidth: 600, - targetHeight: 600, - initWidth: 200, - initHeight: 100, - }, - ], - true -); diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_inner.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_inner.js deleted file mode 100644 index f79e46e78f42..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_inner.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.innerWidth/Height - * when fingerprinting resistance is enabled. This test is for minimum values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 199, - settingHeight: 99, - targetWidth: 200, - targetHeight: 100, - initWidth: 1000, - initHeight: 1000, - }, - { - settingWidth: 10, - settingHeight: 10, - targetWidth: 200, - targetHeight: 100, - initWidth: 1000, - initHeight: 1000, - }, - ], - false -); diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_outer.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_outer.js deleted file mode 100644 index 76b5e40f827b..000000000000 --- a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_windowSetting_min_outer.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Bug 1330882 - A test case for setting window size through window.outerWidth/Height - * when fingerprinting resistance is enabled. This test is for minimum values. - */ - -WindowSettingTest.run( - [ - { - settingWidth: 199, - settingHeight: 99, - targetWidth: 200, - targetHeight: 100, - initWidth: 1000, - initHeight: 1000, - }, - { - settingWidth: 10, - settingHeight: 10, - targetWidth: 200, - targetHeight: 100, - initWidth: 1000, - initHeight: 1000, - }, - ], - true -); diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index 7825471ea7d7..2c513b1dbbe0 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -7608,78 +7608,6 @@ void nsGlobalWindowInner::SetReplaceableWindowCoord( return; } - if (ShouldResistFingerprinting()) { - bool innerWidthSpecified = false; - bool innerHeightSpecified = false; - bool outerWidthSpecified = false; - bool outerHeightSpecified = false; - - if (strcmp(aPropName, "innerWidth") == 0) { - innerWidthSpecified = true; - } else if (strcmp(aPropName, "innerHeight") == 0) { - innerHeightSpecified = true; - } else if (strcmp(aPropName, "outerWidth") == 0) { - outerWidthSpecified = true; - } else if (strcmp(aPropName, "outerHeight") == 0) { - outerHeightSpecified = true; - } - - if (innerWidthSpecified || innerHeightSpecified || outerWidthSpecified || - outerHeightSpecified) { - nsCOMPtr treeOwnerAsWin = outer->GetTreeOwnerWindow(); - nsCOMPtr screenMgr( - do_GetService("@mozilla.org/gfx/screenmanager;1")); - - 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); - - // Acquire content window size. - CSSSize contentSize; - outer->GetInnerSize(contentSize); - - nsCOMPtr screen = screenMgr->ScreenForRect(RoundedToInt( - devWinRect / treeOwnerAsWin->DevicePixelsPerDesktopPixel())); - if (screen) { - int32_t roundedValue = std::round(value); - int32_t* targetContentWidth = nullptr; - int32_t* targetContentHeight = nullptr; - int32_t inputWidth = 0; - int32_t inputHeight = 0; - int32_t unused = 0; - - CSSIntSize availScreenSize = - RoundedToInt(screen->GetAvailRect().Size() / cssScale); - - // Calculate the chrome UI size. - CSSIntSize chromeSize = cssWinRect.Size() - RoundedToInt(contentSize); - - if (innerWidthSpecified || outerWidthSpecified) { - inputWidth = value; - targetContentWidth = &roundedValue; - targetContentHeight = &unused; - } else if (innerHeightSpecified || outerHeightSpecified) { - inputHeight = value; - targetContentWidth = &unused; - targetContentHeight = &roundedValue; - } - - nsContentUtils::CalcRoundedWindowSizeForResistingFingerprinting( - chromeSize.width, chromeSize.height, availScreenSize.width, - availScreenSize.height, inputWidth, inputHeight, - outerWidthSpecified, outerHeightSpecified, targetContentWidth, - targetContentHeight); - value = T(roundedValue); - } - } - } - } - (this->*aSetter)(value, aCallerType, aError); }