Backed out changeset c9867a69b201 (bug 1136732) for frequent OSX m-oth test failures on a CLOSED TREE

--HG--
extra : amend_source : 80dee50cfa32778e27c4999061098b9088f4d80e
This commit is contained in:
Carsten "Tomcat" Book 2015-06-01 16:39:41 +02:00
parent cfa2965ba6
commit 30ae2a8f4f
3 changed files with 4 additions and 5 deletions

View File

@ -48,7 +48,7 @@ searchbar {
/* Prevent shrinking the page content to 0 height and width */
.browserStack > browser {
min-height: 100px;
min-height: 25px;
min-width: 25px;
}

View File

@ -20,18 +20,17 @@ add_task(function*() {
let nbox = gBrowser.getNotificationBox();
let {clientHeight: nboxHeight, clientWidth: nboxWidth} = nbox;
let toolbox = yield gDevTools.showToolbox(TargetFactory.forTab(tab));
let {MIN_PAGE_SIZE} = devtools.require("devtools/framework/toolbox-hosts");
is (nbox.clientHeight, nboxHeight, "Opening the toolbox hasn't changed the height of the nbox");
is (nbox.clientWidth, nboxWidth, "Opening the toolbox hasn't changed the width of the nbox");
let iframe = document.getAnonymousElementByAttribute(nbox, "class", "devtools-toolbox-bottom-iframe");
is (iframe.clientHeight, nboxHeight - MIN_PAGE_SIZE, "The iframe fits within the available space");
is (iframe.clientHeight, nboxHeight - 25, "The iframe fits within the available space");
yield toolbox.switchHost(devtools.Toolbox.HostType.SIDE);
iframe = document.getAnonymousElementByAttribute(nbox, "class", "devtools-toolbox-side-iframe");
iframe.style.minWidth = "1px"; // Disable the min width set in css
is (iframe.clientWidth, nboxWidth - MIN_PAGE_SIZE, "The iframe fits within the available space");
is (iframe.clientWidth, nboxWidth - 25, "The iframe fits within the available space");
yield cleanup(toolbox);
});

View File

@ -14,7 +14,7 @@ Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
* There is also a min-height on the browser, but we still don't want to set
* frame.height to be larger than that, since it can cause problems with
* resizing the toolbox and panel layout. */
const MIN_PAGE_SIZE = exports.MIN_PAGE_SIZE = 100;
const MIN_PAGE_SIZE = 25;
/**
* A toolbox host represents an object that contains a toolbox (e.g. the