From 6d48a286a1f30467913c87aea0f2364c42d61731 Mon Sep 17 00:00:00 2001 From: Michael Ratcliffe Date: Fri, 24 Aug 2018 16:09:58 +0000 Subject: [PATCH 1/3] Bug 1467400 - Disable JavaScript should not be available in the browser toolbox r=gl Differential Revision: https://phabricator.services.mozilla.com/D4234 --HG-- extra : moz-landing-system : lando --- devtools/client/framework/toolbox-options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js index e07d7b86e2bf..c4ea1ecc5cf3 100644 --- a/devtools/client/framework/toolbox-options.js +++ b/devtools/client/framework/toolbox-options.js @@ -456,7 +456,7 @@ OptionsPanel.prototype = { }); } - if (this.target.activeTab) { + if (this.target.activeTab && !this.target.chrome) { const [ response ] = await this.target.client.attachTab(this.target.activeTab._actor); this._origJavascriptEnabled = !response.javascriptEnabled; this.disableJSNode.checked = this._origJavascriptEnabled; From 6fc91f26dcd4349d799a1d3aadfb0f575fd2ca1c Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Fri, 24 Aug 2018 21:23:56 +0000 Subject: [PATCH 2/3] Bug 1483499: Give consistent default padding, regardless of whether it's a child of fieldset. r=mats Differential Revision: https://phabricator.services.mozilla.com/D4029 --HG-- extra : moz-landing-system : lando --- layout/reftests/bugs/476063-1.html | 3 ++ layout/reftests/bugs/476063-4.xhtml | 2 +- .../display-contents-acid-ref.html | 2 +- .../display-contents-fieldset-ref.html | 11 +++-- .../forms/legend/legend-padding-1-ref.html | 43 ++++++++++++++++++ .../forms/legend/legend-padding-1.html | 42 ++++++++++++++++++ .../forms/legend/legend-padding-2-ref.html | 44 +++++++++++++++++++ .../forms/legend/legend-padding-2.html | 43 ++++++++++++++++++ layout/reftests/forms/legend/legend-ref.html | 7 +-- layout/reftests/forms/legend/reftest.list | 2 + layout/style/res/forms.css | 4 +- .../the-fieldset-element-0/legend.html.ini | 13 ------ ...y-contents-fieldset-nested-legend-ref.html | 2 +- 13 files changed, 191 insertions(+), 27 deletions(-) create mode 100644 layout/reftests/forms/legend/legend-padding-1-ref.html create mode 100644 layout/reftests/forms/legend/legend-padding-1.html create mode 100644 layout/reftests/forms/legend/legend-padding-2-ref.html create mode 100644 layout/reftests/forms/legend/legend-padding-2.html diff --git a/layout/reftests/bugs/476063-1.html b/layout/reftests/bugs/476063-1.html index bb59f82cf6b7..d6a2d7f04a04 100644 --- a/layout/reftests/bugs/476063-1.html +++ b/layout/reftests/bugs/476063-1.html @@ -1,5 +1,8 @@ +