Bug 1832733 - Unexpose sizeToContent() in Nightly. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D177867
Thaodan · May 19, 2023 · 67525df · 67525df
1 parent 656f5b6
commit 67525df
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 6 deletions.
diff --git a/browser/components/migration/tests/browser/browser.ini b/browser/components/migration/tests/browser/browser.ini
@@ -6,6 +6,7 @@ prefs =
 
 [browser_aboutwelcome_behavior.js]
 [browser_dialog_cancel_close.js]
+prefs = dom.window.sizeToContent.enabled=true
 [browser_dialog_open.js]
 [browser_dialog_resize.js]
 [browser_disabled_migrator.js]

diff --git a/dom/base/nsDeprecatedOperationList.h b/dom/base/nsDeprecatedOperationList.h
@@ -59,3 +59,4 @@ DEPRECATED_OPERATION(OffscreenCanvasToBlob)
 DEPRECATED_OPERATION(MozPreservesPitchDeprecatedPrefix)
 DEPRECATED_OPERATION(SVGNearestViewportElement)
 DEPRECATED_OPERATION(SVGFarthestViewportElement)
+DEPRECATED_OPERATION(SizeToContent)
diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -3338,6 +3338,12 @@ bool nsGlobalWindowInner::CachesEnabled(JSContext* aCx, JSObject*) {
   return true;
 }
 
+/* static */
+bool nsGlobalWindowInner::IsSizeToContentEnabled(JSContext* aCx, JSObject*) {
+  return StaticPrefs::dom_window_sizeToContent_enabled() ||
+         nsContentUtils::IsSystemCaller(aCx);
+}
+
 nsDOMOfflineResourceList* nsGlobalWindowInner::GetApplicationCache(
     ErrorResult& aError) {
   if (!mApplicationCache) {

diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h
@@ -419,6 +419,8 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
 
   static bool CachesEnabled(JSContext* aCx, JSObject*);
 
+  static bool IsSizeToContentEnabled(JSContext*, JSObject*);
+
   bool DoResolve(
       JSContext* aCx, JS::Handle<JSObject*> aObj, JS::Handle<jsid> aId,
       JS::MutableHandle<mozilla::Maybe<JS::PropertyDescriptor>> aDesc);

diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
@@ -395,6 +395,10 @@ MathML_DeprecatedScriptminsizeAttributeWarning=MathML attribute “scriptminsize
 # LOCALIZATION NOTE: Do not translate MathML and scriptsizemultiplier.
 MathML_DeprecatedScriptsizemultiplierAttributeWarning=MathML attribute “scriptsizemultiplier” is deprecated and will be removed at a future date.
 FormSubmissionUntrustedEventWarning=Form submission via untrusted submit event is deprecated and will be removed at a future date.
+
+# LOCALIZATION NOTE: Do not translate "sizeToContent()".
+SizeToContentWarning=sizeToContent() is deprecated and will be removed in the future.
+
 WebShareAPI_Failed=The share operation has failed.
 WebShareAPI_Aborted=The share operation was aborted.
 # LOCALIZATION NOTE (UnknownProtocolNavigationPrevented): %1$S is the destination URL.

diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini
@@ -161,6 +161,7 @@ skip-if =
 [test_onerror_message.html]
 [test_protochains.html]
 [test_resize_move_windows.html]
+prefs = dom.window.sizeToContent.enabled=true
 skip-if = toolkit == 'android'
   os == 'linux'
   os == "mac" # Bug 1781569
@@ -169,6 +170,7 @@ support-files =
   file_resize_move_windows_1.html
   file_resize_move_windows_2.html
 [test_sizetocontent_clamp.html]
+prefs = dom.window.sizeToContent.enabled=true
 skip-if = toolkit == 'android' #Windows can't change size on Android
 [test_toJSON.html]
 [test_window_bar.html]

diff --git a/dom/tests/mochitest/general/test_interfaces.js b/dom/tests/mochitest/general/test_interfaces.js
@@ -1922,7 +1922,7 @@ let interfaceNamesInGlobalScope = [
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "setTimeout", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
-  { name: "sizeToContent", insecureContext: true },
+  { name: "sizeToContent", insecureContext: true, nightly: false },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "speechSynthesis", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!

diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
@@ -432,10 +432,13 @@ partial interface Window {
    */
   undefined                 scrollByPages(long numPages, optional ScrollOptions options = {});
 
-  /**
-   * Method for sizing this window to the content in the window.
-   */
-  [Throws, NeedsCallerType] undefined sizeToContent();
+  // Gecko specific API that allows a web page to resize the browser window.
+  // Dropping support in bug 1600400.
+  [Throws, NeedsCallerType,
+   Deprecated="SizeToContent",
+   Func="nsGlobalWindowInner::IsSizeToContentEnabled"]
+  undefined sizeToContent();
+
   /**
    * Chrome-only method for sizing to content with a maximum-size constraint on
    * either (or both) directions.

diff --git a/layout/printing/crashtests/crashtests.list b/layout/printing/crashtests/crashtests.list
@@ -3,7 +3,7 @@ load 509839-2.html
 load 576878.xhtml
 asserts-if(Android,0-1) load 793844.html
 skip-if(Android) load 1662259.html
-skip-if(Android) load 1663722.html
+skip-if(Android) pref(dom.window.sizeToContent.enabled,true) load 1663722.html
 skip-if(Android) load 1671503.html
 load 1748277.html # Bug 1751260
 load 1758199-1.html

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -4768,6 +4768,12 @@
   value: false
   mirror: always
 
+# Whether Window.sizeToContent() is enabled.
+- name: dom.window.sizeToContent.enabled
+  type: bool
+  value: @IS_NOT_NIGHTLY_BUILD@
+  mirror: always
+
 - name: dom.worker.canceling.timeoutMilliseconds
   type: RelaxedAtomicUint32
   value: 30000    # 30 seconds