Backed out changeset 1d94f9ef232a (bug 1419755) for causing mochitest failures at dom/canvas/test/webgl-conf/generated/test_conformance__textures__misc__copy-tex-image-and-sub-image-2d.html
authorDaniel Varga <dvarga@mozilla.com>
Mon, 30 Mar 2020 22:40:02 +0300
changeset 521137 7f9f804e9dbe81bce013bf4dea28074744b568f6
parent 521136 3e2c78fcc266122f060144f65d511db7df9f4ea1
child 521138 f6281db0d73200370218b30e54f4ee6675621a19
push id111506
push userdvarga@mozilla.com
push dateMon, 30 Mar 2020 19:40:34 +0000
treeherderautoland@7f9f804e9dbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1419755
milestone76.0a1
backs out1d94f9ef232a9431cb0ed751d9e8582c5ae96d0b
first release with
nightly linux32
7f9f804e9dbe / 76.0a1 / 20200330220101 / files
nightly linux64
7f9f804e9dbe / 76.0a1 / 20200330220101 / files
nightly mac
7f9f804e9dbe / 76.0a1 / 20200330220101 / files
nightly win32
7f9f804e9dbe / 76.0a1 / 20200330220101 / files
nightly win64
7f9f804e9dbe / 76.0a1 / 20200330220101 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1d94f9ef232a (bug 1419755) for causing mochitest failures at dom/canvas/test/webgl-conf/generated/test_conformance__textures__misc__copy-tex-image-and-sub-image-2d.html CLOSED TREE
devtools/client/debugger/src/utils/prefs.js
devtools/client/debugger/src/workers/pretty-print/index.js
--- a/devtools/client/debugger/src/utils/prefs.js
+++ b/devtools/client/debugger/src/utils/prefs.js
@@ -112,17 +112,16 @@ export const prefs = new PrefsHelper("de
   fileSearchWholeWord: ["Bool", "debugger.file-search-whole-word"],
   fileSearchRegexMatch: ["Bool", "debugger.file-search-regex-match"],
   debuggerPrefsSchemaVersion: ["Int", "debugger.prefs-schema-version"],
   projectDirectoryRoot: ["Char", "debugger.project-directory-root", ""],
   skipPausing: ["Bool", "debugger.skip-pausing"],
   mapScopes: ["Bool", "debugger.map-scopes-enabled"],
   logActions: ["Bool", "debugger.log-actions"],
   logEventBreakpoints: ["Bool", "debugger.log-event-breakpoints"],
-  indentSize: ["Int", "editor.tabsize"],
 });
 
 // The pref may not be defined. Defaulting to null isn't viable (cursor never blinks).
 // Can't use CodeMirror.defaults here because it's loaded later.
 // Hardcode the fallback value to that of CodeMirror.defaults.cursorBlinkRate.
 prefs.cursorBlinkRate = Services.prefs.getIntPref("ui.caretBlinkTime", 530);
 
 export const features = new PrefsHelper("devtools.debugger.features", {
--- a/devtools/client/debugger/src/workers/pretty-print/index.js
+++ b/devtools/client/debugger/src/workers/pretty-print/index.js
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // @flow
 
-import { prefs } from "../../utils/prefs";
 import { workerUtils } from "devtools-utils";
 const { WorkerDispatcher } = workerUtils;
 
 import type { URL } from "../../types";
 
 let dispatcher;
 let workerPath;
 
@@ -32,12 +31,12 @@ type PrettyPrintOpts = {
 export async function prettyPrint({ text, url }: PrettyPrintOpts) {
   if (!dispatcher) {
     dispatcher = new WorkerDispatcher();
     dispatcher.start(workerPath);
   }
 
   return dispatcher.invoke("prettyPrint", {
     url,
-    indent: prefs.indentSize,
+    indent: 2,
     sourceText: text,
   });
 }