From 30ae2a8f4f150adc9241f4deb323fd3bc59dc38d Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Mon, 1 Jun 2015 16:39:41 +0200 Subject: [PATCH 1/2] Backed out changeset c9867a69b201 (bug 1136732) for frequent OSX m-oth test failures on a CLOSED TREE --HG-- extra : amend_source : 80dee50cfa32778e27c4999061098b9088f4d80e --- browser/base/content/browser.css | 2 +- .../devtools/framework/test/browser_toolbox_hosts_size.js | 5 ++--- browser/devtools/framework/toolbox-hosts.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 9e7b4a8ea3ba..8ef07e1a6890 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -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; } diff --git a/browser/devtools/framework/test/browser_toolbox_hosts_size.js b/browser/devtools/framework/test/browser_toolbox_hosts_size.js index dc3cac848581..65ac4231c6f3 100644 --- a/browser/devtools/framework/test/browser_toolbox_hosts_size.js +++ b/browser/devtools/framework/test/browser_toolbox_hosts_size.js @@ -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); }); diff --git a/browser/devtools/framework/toolbox-hosts.js b/browser/devtools/framework/toolbox-hosts.js index f889095080b2..83ca259bdd5c 100644 --- a/browser/devtools/framework/toolbox-hosts.js +++ b/browser/devtools/framework/toolbox-hosts.js @@ -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 From f23475cc006fcf63b1b762013eced72653e09cd4 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Mon, 1 Jun 2015 16:45:08 +0200 Subject: [PATCH 2/2] Revert gaia.json and the device image manifests to revision 719e11a4bfdc on a CLOSED TREE a=bustage --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/gaia.json | 4 ++-- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index bd2c2b1a9480..e52b48b6426f 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index c0192986750f..aa9c0cdfb411 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2af2129a4dc2..a5d74d80957a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index acb77b809042..f8c514c163db 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 81e22c8994fb..92d4fdbc6fcd 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 2b17d1c8c146..a7babf68e13f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2af2129a4dc2..a5d74d80957a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index cd532135824e..8093909f28af 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9533b4cea823..7ddce8f8586b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "97c41d6839e2c5fa6962aaf9b1720adf79f219ba", + "git_revision": "85e6fcef45c0cb2c017739df42b68b96cf5bb9c3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "aa653cc24c710327fa734718ea1af94e470f77bc", + "revision": "a4d81914887c6dac8e96e149a573d22fa313444f", "repo_path": "integration/gaia-central" } diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 19f8a454f99d..3d907cddcae5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 7e70628a720b..75b03f6d4a4e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +