Backed out changeset f1ce87511750 (bug 1044597) for bc1 orange

browser/components/preferences/in-content/subdialogs.js

@@ -92,8 +92,6 @@ let gSubDialog = {
     // Clear the sizing attributes
     this._box.removeAttribute("width");
     this._box.removeAttribute("height");
-    this._box.style.removeProperty("min-height");
-    this._box.style.removeProperty("min-width");
 
     setTimeout(() => {
       // Unload the dialog after the event listeners run so that the load of about:blank isn't
@@ -146,22 +144,12 @@ let gSubDialog = {
     // Do this on load to wait for the CSS to load and apply before calculating the size.
     let docEl = this._frame.contentDocument.documentElement;
 
-    let groupBoxTitle = document.getAnonymousElementByAttribute(this._box, "class", "groupbox-title");
-    let groupBoxTitleHeight = groupBoxTitle.clientHeight +
-                              parseFloat(getComputedStyle(groupBoxTitle).borderBottomWidth);
+    // padding-bottom doesn't seem to be included in the scrollHeight of the document element in XUL
+    // so add it ourselves.
+    let paddingBottom = parseFloat(this._frame.contentWindow.getComputedStyle(docEl).paddingBottom);
 
-    let groupBoxBody = document.getAnonymousElementByAttribute(this._box, "class", "groupbox-body");
-    let boxVerticalPadding = 2 * parseFloat(getComputedStyle(groupBoxBody).paddingTop);
-    let boxHorizontalPadding = 2 * parseFloat(getComputedStyle(groupBoxBody).paddingLeft);
-    let frameWidth = docEl.scrollWidth;
-    let frameHeight = docEl.scrollHeight;
-    let boxVerticalBorder = 2 * parseFloat(getComputedStyle(this._box).borderTopWidth);
-    let boxHorizontalBorder = 2 * parseFloat(getComputedStyle(this._box).borderLeftWidth);
-
-    this._frame.style.width = frameWidth + "px";
-    this._frame.style.height = frameHeight + "px";
-    this._box.style.minHeight = (boxVerticalBorder + groupBoxTitleHeight + boxVerticalPadding + frameHeight) + "px";
-    this._box.style.minWidth = (boxHorizontalBorder + boxHorizontalPadding + frameWidth) + "px";
+    this._frame.style.width = docEl.style.width || docEl.scrollWidth + "px";
+    this._frame.style.height = docEl.style.height || (docEl.scrollHeight + paddingBottom) + "px";
 
     this._overlay.style.visibility = "visible";
     this._frame.focus();

browser/components/preferences/in-content/tests/browser_subdialogs.js

@@ -141,8 +141,8 @@ let gTests = [{
                                              (aEvent) => dialogClosingCallback(deferredClose, aEvent));
     let dialog = yield dialogPromise;
 
-    ise(content.gSubDialog._frame.style.width, "528px", "Width should be set on the frame from the dialog");
-    ise(content.gSubDialog._frame.style.height, "280px", "Height should be set on the frame from the dialog");
+    ise(content.gSubDialog._frame.style.width, "32em", "Width should be set on the frame from the dialog");
+    ise(content.gSubDialog._frame.style.height, "40em", "Height should be set on the frame from the dialog");
 
     content.gSubDialog.close();
     yield deferredClose.promise;