Web Inspector: Collapse blackboxed call frames by default
https://bugs.webkit.org/show_bug.cgi?id=234581
<rdar://problem/86967088>
Reviewed by Devin Rousso.
Remove "Collapse blackboxed call frames" checkbox from the experimental settings
and enable the feature by default.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Setting.js:
* UserInterface/Controllers/CallFrameTreeController.js:
(WI.CallFrameTreeController.prototype.groupBlackboxedCallFrames):
* UserInterface/Controllers/DebuggerManager.js:
(WI.DebuggerManager.prototype.shouldAutoExpandBlackboxedCallFrameGroup):
* UserInterface/Views/SettingsTabContentView.js:
(WI.SettingsTabContentView.prototype._createExperimentalSettingsView):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 21d38ab..e0eba26 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,23 @@
+2022-01-25 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Collapse blackboxed call frames by default
+ https://bugs.webkit.org/show_bug.cgi?id=234581
+ <rdar://problem/86967088>
+
+ Reviewed by Devin Rousso.
+
+ Remove "Collapse blackboxed call frames" checkbox from the experimental settings
+ and enable the feature by default.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Base/Setting.js:
+ * UserInterface/Controllers/CallFrameTreeController.js:
+ (WI.CallFrameTreeController.prototype.groupBlackboxedCallFrames):
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WI.DebuggerManager.prototype.shouldAutoExpandBlackboxedCallFrameGroup):
+ * UserInterface/Views/SettingsTabContentView.js:
+ (WI.SettingsTabContentView.prototype._createExperimentalSettingsView):
+
2022-01-25 Devin Rousso <drousso@apple.com>
Web Inspector: replace gear-with-contextmenu icons used for filtering with filter-with-contextmenu icons
diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
index dd24c30..1a2ce46 100644
--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
@@ -344,8 +344,6 @@
localizedStrings["Closure Variables (%s)"] = "Closure Variables (%s)";
localizedStrings["Code"] = "Code";
localizedStrings["Collapse All"] = "Collapse All";
-/* Setting to collapse blackboxed call frames in the debugger. */
-localizedStrings["Collapse blackboxed call frames @ Experimental Settings"] = "Collapse blackboxed call frames";
localizedStrings["Collapse columns"] = "Collapse columns";
localizedStrings["Collect garbage"] = "Collect garbage";
/* Section header for the group of CSS variables with colors as values */
@@ -445,8 +443,6 @@
localizedStrings["Debugger disabled during Audit"] = "Debugger disabled during Audit";
localizedStrings["Debugger disabled during Timeline recording"] = "Debugger disabled during Timeline recording";
localizedStrings["Debugging:"] = "Debugging:";
-/* Category label for experimental settings related to debugging. */
-localizedStrings["Debugging: @ Experimental Settings"] = "Debugging:";
localizedStrings["Debugs"] = "Debugs";
localizedStrings["Decoded"] = "Decoded";
localizedStrings["Default"] = "Default";
diff --git a/Source/WebInspectorUI/UserInterface/Base/Setting.js b/Source/WebInspectorUI/UserInterface/Base/Setting.js
index 853f7fc..0acdd1a 100644
--- a/Source/WebInspectorUI/UserInterface/Base/Setting.js
+++ b/Source/WebInspectorUI/UserInterface/Base/Setting.js
@@ -229,7 +229,6 @@
experimentalEnablePreviewFeatures: new WI.Setting("experimental-enable-preview-features", true),
experimentalEnableStylesJumpToEffective: new WI.Setting("experimental-styles-jump-to-effective", false),
experimentalEnableStylesJumpToVariableDeclaration: new WI.Setting("experimental-styles-jump-to-variable-declaration", false),
- experimentalCollapseBlackboxedCallFrames: new WI.Setting("experimental-collapse-blackboxed-call-frames", false),
experimentalAllowInspectingInspector: new WI.Setting("experimental-allow-inspecting-inspector", false),
experimentalCSSCompletionFuzzyMatching: new WI.Setting("experimental-css-completion-fuzzy-matching", true),
diff --git a/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js b/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js
index 5ae4ce2..5e0d514 100644
--- a/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js
+++ b/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js
@@ -78,7 +78,7 @@
if (!displayable(callFrame))
continue;
- if (callFrame.blackboxed && WI.settings.experimentalCollapseBlackboxedCallFrames.value) {
+ if (callFrame.blackboxed) {
blackboxedCallFrameGroupStartIndex ??= i;
continue;
}
diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
index 62828a7..04f06aa 100644
--- a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
+++ b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
@@ -540,7 +540,6 @@
shouldAutoExpandBlackboxedCallFrameGroup(blackboxedCallFrameGroup)
{
- console.assert(WI.settings.experimentalCollapseBlackboxedCallFrames.value);
console.assert(Array.isArray(blackboxedCallFrameGroup) && blackboxedCallFrameGroup.length && blackboxedCallFrameGroup.every((callFrame) => callFrame instanceof WI.CallFrame && callFrame.blackboxed), blackboxedCallFrameGroup);
return this._blackboxedCallFrameGroupsToAutoExpand.some((blackboxedCallFrameGroupToAutoExpand) => {
diff --git a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
index daa9949..61db766 100644
--- a/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
+++ b/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js
@@ -402,12 +402,6 @@
experimentalSettingsView.addSeparator();
}
- let supportsBlackboxingScripts = WI.DebuggerManager.supportsBlackboxingScripts();
- if (supportsBlackboxingScripts) {
- experimentalSettingsView.addSetting(WI.UIString("Debugging:", "Debugging: @ Experimental Settings", "Category label for experimental settings related to debugging."), WI.settings.experimentalCollapseBlackboxedCallFrames, WI.UIString("Collapse blackboxed call frames", "Collapse blackboxed call frames @ Experimental Settings", "Setting to collapse blackboxed call frames in the debugger."));
- experimentalSettingsView.addSeparator();
- }
-
let diagnosticsGroup = experimentalSettingsView.addGroup(WI.UIString("Diagnostics:", "Diagnostics: @ Experimental Settings", "Category label for experimental settings related to Web Inspector diagnostics."));
diagnosticsGroup.addSetting(WI.settings.experimentalAllowInspectingInspector, WI.UIString("Allow Inspecting Web Inspector", "Allow Inspecting Web Inspector @ Experimental Settings", "Label for setting that allows the user to inspect the Web Inspector user interface."));
experimentalSettingsView.addSeparator();
@@ -436,9 +430,6 @@
listenForChange(WI.settings.experimentalEnableStylesJumpToVariableDeclaration);
}
- if (supportsBlackboxingScripts)
- listenForChange(WI.settings.experimentalCollapseBlackboxedCallFrames);
-
this._createReferenceLink(experimentalSettingsView);
this.addSettingsView(experimentalSettingsView);
