Bug 1790912 - Migrate js/ductwork/debugger to devtools/platform. r=oc…

…hameau This gecko integration code is better managed with the other devtools platform hook code. To simplify resolving the JSM and avoiding issues around restricted use of eval in chrome, I also reset the DIST_SUBDIR config and run the xpcshell tests without a firefox-appdir. The test works on Android these days, so re-enable it on that platform. Differential Revision: https://phabricator.services.mozilla.com/D157522
Thaodan · Sep 25, 2022 · 7a57865 · 7a57865
1 parent 410e8df
commit 7a57865
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 58 deletions.
diff --git a/.eslintrc-test-paths.js b/.eslintrc-test-paths.js
@@ -54,7 +54,6 @@ const extraXpcshellTestPaths = [
   "intl/benchmarks/",
   "intl/l10n/test/",
   "ipc/testshell/tests/",
-  "js/ductwork/debugger/tests/",
   "memory/replace/dmd/test/",
   "netwerk/test/httpserver/test/",
   "testing/modules/tests/xpcshell/",

diff --git a/js/ductwork/debugger/IJSDebugger.idl → devtools/platform/IJSDebugger.idl b/js/ductwork/debugger/IJSDebugger.idl → devtools/platform/IJSDebugger.idl
diff --git a/js/ductwork/debugger/JSDebugger.cpp → devtools/platform/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp → devtools/platform/JSDebugger.cpp
diff --git a/js/ductwork/debugger/JSDebugger.h → devtools/platform/JSDebugger.h b/js/ductwork/debugger/JSDebugger.h → devtools/platform/JSDebugger.h
diff --git a/devtools/platform/components.conf b/devtools/platform/components.conf
@@ -11,4 +11,10 @@ Classes = [
         'type': 'mozilla::jsinspector::nsJSInspector',
         'headers': ['/devtools/platform/nsJSInspector.h'],
     },
+    {
+        'cid': '{0365cbd5-d46e-4e94-a39f-83b63cd1a963}',
+        'contract_ids': ['@mozilla.org/jsdebugger;1'],
+        'type': 'mozilla::jsdebugger::JSDebugger',
+        'headers': ['/devtools/platform/JSDebugger.h'],
+    },
 ]
diff --git a/js/ductwork/debugger/jsdebugger.jsm → devtools/platform/jsdebugger.jsm b/js/ductwork/debugger/jsdebugger.jsm → devtools/platform/jsdebugger.jsm
diff --git a/devtools/platform/moz.build b/devtools/platform/moz.build
@@ -7,17 +7,27 @@
 XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"]
 
 XPIDL_SOURCES += [
+    "IJSDebugger.idl",
     "nsIJSInspector.idl",
 ]
 
-XPIDL_MODULE = "jsinspector"
+XPIDL_MODULE = "jsdevtools"
 
 SOURCES += [
+    "JSDebugger.cpp",
     "nsJSInspector.cpp",
 ]
 
 XPCOM_MANIFESTS += [
     "components.conf",
 ]
 
+EXTRA_JS_MODULES += [
+    "jsdebugger.jsm",
+]
+
+# The /devtools/moz.build opted in to treatment of devtools as a browser
+# component, but for this platform integration code it is simpler not too.
+DIST_SUBDIR = ""
+
 FINAL_LIBRARY = "xul"
diff --git a/js/ductwork/debugger/tests/head_dbg.js → devtools/platform/tests/xpcshell/head_dbg.js b/js/ductwork/debugger/tests/head_dbg.js → devtools/platform/tests/xpcshell/head_dbg.js
diff --git a/...ork/debugger/tests/test_nativewrappers.js → ...orm/tests/xpcshell/test_nativewrappers.js b/...ork/debugger/tests/test_nativewrappers.js → ...orm/tests/xpcshell/test_nativewrappers.js
diff --git a/devtools/platform/tests/xpcshell/xpcshell.ini b/devtools/platform/tests/xpcshell/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 tags = devtools
-firefox-appdir = browser
-skip-if = toolkit == 'android'
+head = head_dbg.js
 
 [test_nsjsinspector.js]
+[test_nativewrappers.js]
diff --git a/js/ductwork/debugger/components.conf b/js/ductwork/debugger/components.conf
diff --git a/js/ductwork/debugger/moz.build b/js/ductwork/debugger/moz.build
diff --git a/js/ductwork/debugger/tests/xpcshell.ini b/js/ductwork/debugger/tests/xpcshell.ini
diff --git a/js/src/devtools/rootAnalysis/build.js b/js/src/devtools/rootAnalysis/build.js
@@ -9,7 +9,7 @@ set -e
 cd $SOURCE
 ./mach configure
 ./mach build export
-./mach build -X nsprpub mfbt memory memory/mozalloc modules/zlib mozglue js/src xpcom/glue js/ductwork/debugger js/xpconnect/loader js/xpconnect/wrappers js/xpconnect/src
+./mach build -X nsprpub mfbt memory memory/mozalloc modules/zlib mozglue js/src xpcom/glue js/xpconnect/loader js/xpconnect/wrappers js/xpconnect/src
 status=$?
 echo "[[[[ build.js complete, exit code $status ]]]]"
 exit $status
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
@@ -140,7 +140,6 @@ DIRS += [
     '/toolkit/library',
     '/services',
     '/startupcache',
-    '/js/ductwork/debugger',
     '/other-licenses/snappy',
 ]
 

diff --git a/tools/esmify/map.json b/tools/esmify/map.json
@@ -1854,7 +1854,7 @@
   "resource://gre/modules/handlers/HandlerList.jsm":
     "uriloader/exthandler/HandlerList.jsm",
   "resource://gre/modules/jsdebugger.jsm":
-    "js/ductwork/debugger/jsdebugger.jsm",
+    "devtools/platform/jsdebugger.jsm",
   "resource://gre/modules/kvstore.jsm":
     "toolkit/components/kvstore/kvstore.jsm",
   "resource://gre/modules/lz4.js": "toolkit/components/lz4/lz4.js",