Bug 1563680 - Move network monitor actor files into the network-monitor directory r=Honza
authorJeremy <vanhagarsux@hotmail.com>
Fri, 19 Jul 2019 06:40:38 +0000
changeset 483465 47a9a289491ec4f0c2250e162e14698fe6016ad0
parent 483464 0dac048b774a36f3116f25ae85b9ad8fa8c1f7c6
child 483466 cd8429ed99480de9aee8c12561bc109b25ae639d
push id90403
push userjodvarko@mozilla.com
push dateFri, 19 Jul 2019 06:41:03 +0000
treeherderautoland@47a9a289491e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersHonza
bugs1563680
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1563680 - Move network monitor actor files into the network-monitor directory r=Honza Moved network monitor actor files: network-monitor.js network-event.js into devtools/server/actors/network-monitor directory. And updated moz.build files presented in related directories. Differential Revision: https://phabricator.services.mozilla.com/D38219
devtools/server/actors/moz.build
devtools/server/actors/network-event.js
devtools/server/actors/network-monitor.js
devtools/server/actors/network-monitor/moz.build
devtools/server/actors/network-monitor/network-event.js
devtools/server/actors/network-monitor/network-monitor.js
devtools/server/actors/webconsole.js
--- a/devtools/server/actors/moz.build
+++ b/devtools/server/actors/moz.build
@@ -34,18 +34,16 @@ DevToolsModules(
     'errordocs.js',
     'frame.js',
     'framerate.js',
     'heap-snapshot-file.js',
     'highlighters.css',
     'highlighters.js',
     'layout.js',
     'memory.js',
-    'network-event.js',
-    'network-monitor.js',
     'object.js',
     'pause-scoped.js',
     'perf.js',
     'performance-recording.js',
     'performance.js',
     'preference.js',
     'process.js',
     'promises.js',
--- a/devtools/server/actors/network-monitor/moz.build
+++ b/devtools/server/actors/network-monitor/moz.build
@@ -1,13 +1,15 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 DevToolsModules(
     'channel-event-sink.js',
+    'network-event.js',
+    'network-monitor.js',
     'network-observer.js',
     'network-response-listener.js',
     'stack-trace-collector.js',
     'websocket-actor.js',
 )
rename from devtools/server/actors/network-event.js
rename to devtools/server/actors/network-monitor/network-event.js
rename from devtools/server/actors/network-monitor.js
rename to devtools/server/actors/network-monitor/network-monitor.js
--- a/devtools/server/actors/network-monitor.js
+++ b/devtools/server/actors/network-monitor/network-monitor.js
@@ -11,17 +11,17 @@ loader.lazyRequireGetter(
   this,
   "NetworkObserver",
   "devtools/server/actors/network-monitor/network-observer",
   true
 );
 loader.lazyRequireGetter(
   this,
   "NetworkEventActor",
-  "devtools/server/actors/network-event",
+  "devtools/server/actors/network-monitor/network-event",
   true
 );
 
 const NetworkMonitorActor = ActorClassWithSpec(networkMonitorSpec, {
   /**
    * NetworkMonitorActor is instanciated from WebConsoleActor.startListeners
    * Either in the same process, for debugging service worker requests or when debugging
    * the parent process itself and tracking chrome requests.
--- a/devtools/server/actors/webconsole.js
+++ b/devtools/server/actors/webconsole.js
@@ -28,17 +28,17 @@ loader.lazyRequireGetter(
   this,
   "evalWithDebugger",
   "devtools/server/actors/webconsole/eval-with-debugger",
   true
 );
 loader.lazyRequireGetter(
   this,
   "NetworkMonitorActor",
-  "devtools/server/actors/network-monitor",
+  "devtools/server/actors/network-monitor/network-monitor",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ConsoleProgressListener",
   "devtools/server/actors/webconsole/listeners/console-progress",
   true
 );
@@ -726,17 +726,18 @@ WebConsoleActor.prototype = {
               Services.appinfo.processType !=
                 Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT &&
               this.parentActor.messageManager;
             if (isInContentProcess) {
               // Start a network monitor in the parent process to listen to
               // most requests that happen in parent. This one will communicate through
               // `messageManager`.
               await this.conn.spawnActorInParentProcess(this.actorID, {
-                module: "devtools/server/actors/network-monitor",
+                module:
+                  "devtools/server/actors/network-monitor/network-monitor",
                 constructor: "NetworkMonitorActor",
                 args: [
                   { outerWindowID: this.parentActor.outerWindowID },
                   this.actorID,
                 ],
               });
               this.netmonitors.push({
                 messageManager: this.parentActor.messageManager,