Only enable custom formatters for the current session.

hashseed · Commit Bot · commit 85e196bd4bc6 · 2020-05-05T11:43:26.000Z
R=bmeurer@chromium.org Bug: 1016755 Change-Id: Id551e01153ba638a7d79319be5608f412980b7bb Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2156350 Commit-Queue: Yang Guo <yangguo@chromium.org> Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
diff --git a/front_end/sdk/RuntimeModel.js b/front_end/sdk/RuntimeModel.js
@@ -61,9 +61,9 @@ export class RuntimeModel extends SDKModel {
     /** @type {?boolean} */
     this._hasSideEffectSupport = null;
 
-    if (Common.Settings.Settings.instance().moduleSetting('customFormatters').get()) {
-      this._agent.setCustomObjectFormatterEnabled(true);
-    }
+    // TODO(1016755): remove custom formatters altogether.
+    Common.Settings.Settings.instance().moduleSetting('customFormatters').set(false);
+    this._agent.setCustomObjectFormatterEnabled(false);
 
     Common.Settings.Settings.instance()
         .moduleSetting('customFormatters')
diff --git a/front_end/sdk/module.json b/front_end/sdk/module.json
@@ -362,7 +362,7 @@
     {
       "type": "setting",
       "category": "Console",
-      "title": "Enable custom formatters",
+      "title": "Temporarily enable deprecated custom formatters",
       "settingName": "customFormatters",
       "settingType": "boolean",
       "defaultValue": false
diff --git a/front_end/sdk/sdk_strings.grdp b/front_end/sdk/sdk_strings.grdp
@@ -52,9 +52,6 @@
   <message name="IDS_DEVTOOLS_1826966037c093803f9bd475b362057d" desc="Tooltip to explain why a cookie was blocked">
     This Set-Cookie was blocked because it was not sent over a secure connection and would have overwritten a cookie with the Secure attribute.
   </message>
-  <message name="IDS_DEVTOOLS_185bf49541541933dc3fd1fb89d3fea3" desc="Title of a setting under the Console category in Settings">
-    Enable custom formatters
-  </message>
   <message name="IDS_DEVTOOLS_1985576209a186984f171efd81e91e3d" desc="Text in Network Log">
     &lt;anonymous&gt;
   </message>
@@ -551,6 +548,9 @@
   <message name="IDS_DEVTOOLS_f2a47c6809d88e175dade0ef7b16aa13" desc="Text in DOMDebugger Model">
     Mouse
   </message>
+  <message name="IDS_DEVTOOLS_f45d84159df792235cfe12839b868a26" desc="Title of a setting under the Console category in Settings">
+    Temporarily enable deprecated custom formatters
+  </message>
   <message name="IDS_DEVTOOLS_f6137609f4decf877ede5bd3a3125629" desc="Text in CPUProfile Data Model">
     <ph name="LOCKED_1">DevTools</ph>: CPU profile parser is fixing <ph name="COUNT">$1s<ex>2</ex></ph> missing samples.
   </message>

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@`
`362`	`362`	`{`
`363`	`363`	`"type": "setting",`
`364`	`364`	`"category": "Console",`
`365`		`- "title": "Enable custom formatters",`
	`365`	`+ "title": "Temporarily enable deprecated custom formatters",`
`366`	`366`	`"settingName": "customFormatters",`
`367`	`367`	`"settingType": "boolean",`
`368`	`368`	`"defaultValue": false`