Bug 1811853 - Move symbolication files to the shared/ directory r=canaltinova

Differential Revision: https://phabricator.services.mozilla.com/D167846
This commit is contained in:
Julien Wajsberg 2023-02-13 16:46:38 +00:00
parent 686ac4bb70
commit 58de75b2da
12 changed files with 28 additions and 26 deletions

View file

@ -91,7 +91,7 @@ devtools/server/tests/xpcshell/setBreakpoint*
devtools/server/tests/xpcshell/sourcemapped.js devtools/server/tests/xpcshell/sourcemapped.js
# Ignore generated code from wasm-bindgen # Ignore generated code from wasm-bindgen
devtools/client/performance-new/profiler_get_symbols.js devtools/client/performance-new/shared/profiler_get_symbols.js
# Testing syntax error # Testing syntax error
devtools/client/webconsole/test/browser/test-syntaxerror-worklet.js devtools/client/webconsole/test/browser/test-syntaxerror-worklet.js

View file

@ -27,11 +27,11 @@ declare namespace MockedExports {
"resource:///modules/CustomizableWidgets.jsm": typeof import("resource:///modules/CustomizableWidgets.jsm"); "resource:///modules/CustomizableWidgets.jsm": typeof import("resource:///modules/CustomizableWidgets.jsm");
"resource://devtools/shared/loader/Loader.sys.mjs": typeof import("resource://devtools/shared/loader/Loader.sys.mjs"); "resource://devtools/shared/loader/Loader.sys.mjs": typeof import("resource://devtools/shared/loader/Loader.sys.mjs");
"resource://devtools/client/performance-new/shared/background.jsm.js": typeof import("resource://devtools/client/performance-new/shared/background.jsm.js"); "resource://devtools/client/performance-new/shared/background.jsm.js": typeof import("resource://devtools/client/performance-new/shared/background.jsm.js");
"resource://devtools/client/performance-new/shared/symbolication.jsm.js": typeof import("resource://devtools/client/performance-new/shared/symbolication.jsm.js");
"resource://devtools/shared/loader/browser-loader.js": any; "resource://devtools/shared/loader/browser-loader.js": any;
"resource://devtools/client/performance-new/popup/menu-button.jsm.js": typeof import("resource://devtools/client/performance-new/popup/menu-button.jsm.js"); "resource://devtools/client/performance-new/popup/menu-button.jsm.js": typeof import("resource://devtools/client/performance-new/popup/menu-button.jsm.js");
"resource://devtools/client/performance-new/typescript-lazy-load.jsm.js": typeof import("resource://devtools/client/performance-new/typescript-lazy-load.jsm.js"); "resource://devtools/client/performance-new/typescript-lazy-load.jsm.js": typeof import("resource://devtools/client/performance-new/typescript-lazy-load.jsm.js");
"resource://devtools/client/performance-new/popup/panel.jsm.js": typeof import("resource://devtools/client/performance-new/popup/panel.jsm.js"); "resource://devtools/client/performance-new/popup/panel.jsm.js": typeof import("resource://devtools/client/performance-new/popup/panel.jsm.js");
"resource://devtools/client/performance-new/symbolication.jsm.js": typeof import("resource://devtools/client/performance-new/symbolication.jsm.js");
"resource:///modules/PanelMultiView.jsm": typeof import("resource:///modules/PanelMultiView.jsm"); "resource:///modules/PanelMultiView.jsm": typeof import("resource:///modules/PanelMultiView.jsm");
} }
@ -46,7 +46,9 @@ declare namespace MockedExports {
* Then add the file path to the KnownModules above. * Then add the file path to the KnownModules above.
*/ */
import: <S extends keyof KnownModules>(module: S) => KnownModules[S]; import: <S extends keyof KnownModules>(module: S) => KnownModules[S];
importESModule: <S extends keyof KnownModules>(module: S) => KnownModules[S]; importESModule: <S extends keyof KnownModules>(
module: S
) => KnownModules[S];
defineModuleGetter: (target: any, variable: string, path: string) => void; defineModuleGetter: (target: any, variable: string, path: string) => void;
defineESModuleGetters: (target: any, mappings: any) => void; defineESModuleGetters: (target: any, mappings: any) => void;
} }
@ -151,7 +153,7 @@ declare namespace MockedExports {
set: (name: string, value: string) => void; set: (name: string, value: string) => void;
get: (name: string) => string; get: (name: string) => string;
exists: (name: string) => boolean; exists: (name: string) => boolean;
}, };
prefs: nsIPrefBranch; prefs: nsIPrefBranch;
profiler: { profiler: {
StartProfiler: ( StartProfiler: (
@ -332,8 +334,8 @@ declare module "resource://devtools/client/performance-new/shared/background.jsm
export = Background; export = Background;
} }
declare module "resource://devtools/client/performance-new/symbolication.jsm.js" { declare module "resource://devtools/client/performance-new/shared/symbolication.jsm.js" {
import * as PerfSymbolication from "devtools/client/performance-new/symbolication.jsm.js"; import * as PerfSymbolication from "devtools/client/performance-new/shared/symbolication.jsm.js";
export = PerfSymbolication; export = PerfSymbolication;
} }

View file

@ -70,7 +70,7 @@ const {
sharedLibrariesFromProfile, sharedLibrariesFromProfile,
} = require("resource://devtools/client/performance-new/browser.js"); } = require("resource://devtools/client/performance-new/browser.js");
const { createLocalSymbolicationService } = ChromeUtils.import( const { createLocalSymbolicationService } = ChromeUtils.import(
"resource://devtools/client/performance-new/symbolication.jsm.js" "resource://devtools/client/performance-new/shared/symbolication.jsm.js"
); );
const { const {
presets, presets,

View file

@ -15,9 +15,6 @@ DevToolsModules(
"browser.js", "browser.js",
"initializer.js", "initializer.js",
"panel.js", "panel.js",
"profiler_get_symbols.js",
"symbolication-worker.js",
"symbolication.jsm.js",
"typescript-lazy-load.jsm.js", "typescript-lazy-load.jsm.js",
"utils.js", "utils.js",
) )

View file

@ -95,7 +95,7 @@ const lazy = createLazyLoaders({
ChromeUtils.import("resource:///modules/CustomizableUI.jsm"), ChromeUtils.import("resource:///modules/CustomizableUI.jsm"),
PerfSymbolication: () => PerfSymbolication: () =>
ChromeUtils.import( ChromeUtils.import(
"resource://devtools/client/performance-new/symbolication.jsm.js" "resource://devtools/client/performance-new/shared/symbolication.jsm.js"
), ),
ProfilerMenuButton: () => ProfilerMenuButton: () =>
ChromeUtils.import( ChromeUtils.import(

View file

@ -5,6 +5,9 @@
DevToolsModules( DevToolsModules(
"background.jsm.js", "background.jsm.js",
"profiler_get_symbols.js",
"symbolication-worker.js",
"symbolication.jsm.js",
) )
with Files("**"): with Files("**"):

View file

@ -14,12 +14,12 @@
/* import-globals-from profiler_get_symbols.js */ /* import-globals-from profiler_get_symbols.js */
importScripts( importScripts(
"resource://devtools/client/performance-new/profiler_get_symbols.js" "resource://devtools/client/performance-new/shared/profiler_get_symbols.js"
); );
/** /**
* @typedef {import("./@types/perf").SymbolicationWorkerInitialMessage} SymbolicationWorkerInitialMessage * @typedef {import("../@types/perf").SymbolicationWorkerInitialMessage} SymbolicationWorkerInitialMessage
* @typedef {import("./@types/perf").FileHandle} FileHandle * @typedef {import("../@types/perf").FileHandle} FileHandle
*/ */
// This worker uses the wasm module that was generated from https://github.com/mstange/profiler-get-symbols. // This worker uses the wasm module that was generated from https://github.com/mstange/profiler-get-symbols.

View file

@ -8,16 +8,16 @@
const lazy = {}; const lazy = {};
/** /**
* @typedef {import("./@types/perf").Library} Library * @typedef {import("../@types/perf").Library} Library
* @typedef {import("./@types/perf").PerfFront} PerfFront * @typedef {import("../@types/perf").PerfFront} PerfFront
* @typedef {import("./@types/perf").SymbolTableAsTuple} SymbolTableAsTuple * @typedef {import("../@types/perf").SymbolTableAsTuple} SymbolTableAsTuple
* @typedef {import("./@types/perf").SymbolicationService} SymbolicationService * @typedef {import("../@types/perf").SymbolicationService} SymbolicationService
* @typedef {import("./@types/perf").SymbolicationWorkerInitialMessage} SymbolicationWorkerInitialMessage * @typedef {import("../@types/perf").SymbolicationWorkerInitialMessage} SymbolicationWorkerInitialMessage
*/ */
/** /**
* @template R * @template R
* @typedef {import("./@types/perf").SymbolicationWorkerReplyData<R>} SymbolicationWorkerReplyData<R> * @typedef {import("../@types/perf").SymbolicationWorkerReplyData<R>} SymbolicationWorkerReplyData<R>
*/ */
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
@ -234,7 +234,7 @@ class LocalSymbolicationService {
module, module,
}; };
return getResultFromWorker( return getResultFromWorker(
"resource://devtools/client/performance-new/symbolication-worker.js", "resource://devtools/client/performance-new/shared/symbolication-worker.js",
initialMessage initialMessage
); );
} }
@ -258,7 +258,7 @@ class LocalSymbolicationService {
module, module,
}; };
return getResultFromWorker( return getResultFromWorker(
"resource://devtools/client/performance-new/symbolication-worker.js", "resource://devtools/client/performance-new/shared/symbolication-worker.js",
initialMessage initialMessage
); );
} }

View file

@ -614,7 +614,7 @@ bool nsContentSecurityUtils::IsEvalAllowed(JSContext* cx,
// The profiler's symbolication code uses a wasm module to extract symbols // The profiler's symbolication code uses a wasm module to extract symbols
// from the binary files result of local builds. // from the binary files result of local builds.
// See bug 1777479 // See bug 1777479
"resource://devtools/client/performance-new/symbolication.jsm.js"_ns, "resource://devtools/client/performance-new/shared/symbolication.jsm.js"_ns,
// The Browser Toolbox/Console // The Browser Toolbox/Console
"debugger"_ns, "debugger"_ns,

View file

@ -22,7 +22,7 @@ var { ExtensionError } = ExtensionUtils;
XPCOMUtils.defineLazyGetter(this, "symbolicationService", () => { XPCOMUtils.defineLazyGetter(this, "symbolicationService", () => {
let { createLocalSymbolicationService } = ChromeUtils.import( let { createLocalSymbolicationService } = ChromeUtils.import(
"resource://devtools/client/performance-new/symbolication.jsm.js" "resource://devtools/client/performance-new/shared/symbolication.jsm.js"
); );
return createLocalSymbolicationService(Services.profiler.sharedLibraries, []); return createLocalSymbolicationService(Services.profiler.sharedLibraries, []);
}); });

View file

@ -737,8 +737,8 @@
"devtools/client/performance-new/popup/menu-button.jsm.js", "devtools/client/performance-new/popup/menu-button.jsm.js",
"resource://devtools/client/performance-new/popup/panel.jsm.js": "resource://devtools/client/performance-new/popup/panel.jsm.js":
"devtools/client/performance-new/popup/panel.jsm.js", "devtools/client/performance-new/popup/panel.jsm.js",
"resource://devtools/client/performance-new/symbolication.jsm.js": "resource://devtools/client/performance-new/shared/symbolication.jsm.js":
"devtools/client/performance-new/symbolication.jsm.js", "devtools/client/performance-new/shared/symbolication.jsm.js",
"resource://devtools/client/performance-new/typescript-lazy-load.jsm.js": "resource://devtools/client/performance-new/typescript-lazy-load.jsm.js":
"devtools/client/performance-new/typescript-lazy-load.jsm.js", "devtools/client/performance-new/typescript-lazy-load.jsm.js",
"resource://devtools/client/storage/VariablesView.jsm": "resource://devtools/client/storage/VariablesView.jsm":