Bug 1317102 - Part 5: Increase the max grid highlighters shown to 3. r=pbro
authorGabriel Luong <gabriel.luong@gmail.com>
Mon, 08 Oct 2018 12:29:09 -0400
changeset 495764 327ce5456680670da3b98e025fd6319f95570a71
parent 495763 163c65f9c522229c0bbc3a73055499c8b406189a
child 495765 d5d0bf9bccec6612fdb26115ed25bbdd45f159ed
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspbro
bugs1317102
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1317102 - Part 5: Increase the max grid highlighters shown to 3. r=pbro
devtools/client/inspector/grids/test/browser_grids_grid-list-on-mutation-element-added.js
devtools/client/inspector/grids/test/browser_grids_grid-list-toggle-grids_02.js
devtools/client/inspector/rules/test/browser_rules_grid-toggle_03.js
devtools/client/preferences/devtools-client.js
--- a/devtools/client/inspector/grids/test/browser_grids_grid-list-on-mutation-element-added.js
+++ b/devtools/client/inspector/grids/test/browser_grids_grid-list-on-mutation-element-added.js
@@ -17,16 +17,17 @@ const TEST_URI = `
   </div>
   <div id="grid2">
     <div class="cell1">cell1</div>
     <div class="cell2">cell2</div>
   </div>
 `;
 
 add_task(async function() {
+  await pushPref("devtools.gridinspector.maxHighlighters", 1);
   await addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
   const { inspector, gridInspector, testActor } = await openLayoutView();
   const { document: doc } = gridInspector;
   const { highlighters, store } = inspector;
 
   await selectNode("#grid", inspector);
   const gridList = doc.getElementById("grid-list");
   const checkbox1 = gridList.children[0].querySelector("input");
--- a/devtools/client/inspector/grids/test/browser_grids_grid-list-toggle-grids_02.js
+++ b/devtools/client/inspector/grids/test/browser_grids_grid-list-toggle-grids_02.js
@@ -18,16 +18,17 @@ const TEST_URI = `
   </div>
   <div id="grid2" class="grid">
     <div class="cell1">cell1</div>
     <div class="cell2">cell2</div>
   </div>
 `;
 
 add_task(async function() {
+  await pushPref("devtools.gridinspector.maxHighlighters", 1);
   await addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
   const { inspector, gridInspector } = await openLayoutView();
   const { document: doc } = gridInspector;
   const { highlighters, store } = inspector;
 
   await selectNode("#grid1", inspector);
   const gridList = doc.getElementById("grid-list");
   const checkbox1 = gridList.children[0].querySelector("input");
--- a/devtools/client/inspector/rules/test/browser_rules_grid-toggle_03.js
+++ b/devtools/client/inspector/rules/test/browser_rules_grid-toggle_03.js
@@ -18,16 +18,17 @@ const TEST_URI = `
   </div>
   <div id="grid2" class="grid">
     <div class="cell1">cell1</div>
     <div class="cell2">cell2</div>
   </div>
 `;
 
 add_task(async function() {
+  await pushPref("devtools.gridinspector.maxHighlighters", 1);
   await addTab("data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
   const {inspector, view} = await openRuleView();
   const highlighters = view.highlighters;
 
   info("Selecting the first grid container.");
   await selectNode("#grid1", inspector);
   let container = getRuleViewProperty(view, ".grid", "display").valueSpan;
   let gridToggle = container.querySelector(".ruleview-grid");
--- a/devtools/client/preferences/devtools-client.js
+++ b/devtools/client/preferences/devtools-client.js
@@ -69,17 +69,17 @@ pref("devtools.flexboxinspector.enabled"
 
 // Grid highlighter preferences
 pref("devtools.gridinspector.gridOutlineMaxColumns", 50);
 pref("devtools.gridinspector.gridOutlineMaxRows", 50);
 pref("devtools.gridinspector.showGridAreas", false);
 pref("devtools.gridinspector.showGridLineNumbers", false);
 pref("devtools.gridinspector.showInfiniteLines", false);
 // Max number of grid highlighters that can be displayed
-pref("devtools.gridinspector.maxHighlighters", 1);
+pref("devtools.gridinspector.maxHighlighters", 3);
 
 // Whether or not the box model panel is opened in the layout view
 pref("devtools.layout.boxmodel.opened", true);
 // Whether or not the flexbox panel is opened in the layout view
 pref("devtools.layout.flexbox.opened", true);
 // Whether or not the grid inspector panel is opened in the layout view
 pref("devtools.layout.grid.opened", true);