Bug 1690472 - [remote] Move sharable top-level JS modules to shared/ …

…subfolder. r=remote-protocol-reviewers,jgraham Differential Revision: https://phabricator.services.mozilla.com/D103944
dothq · Feb 5, 2021 · 696ff9b · 696ff9b
1 parent cc03966
commit 696ff9b
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 24 deletions.
diff --git a/remote/Connection.jsm b/remote/Connection.jsm
@@ -10,8 +10,10 @@ const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-const { truncate } = ChromeUtils.import("chrome://remote/content/Format.jsm");
-const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
+const { truncate } = ChromeUtils.import(
+  "chrome://remote/content/shared/Format.jsm"
+);
+const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
 const { UnknownMethodError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"
 );

diff --git a/remote/Error.jsm b/remote/Error.jsm
@@ -11,7 +11,7 @@ var EXPORTED_SYMBOLS = [
   "UnsupportedError",
 ];
 
-const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"

diff --git a/remote/JSONHandler.jsm b/remote/JSONHandler.jsm
@@ -11,7 +11,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { HTTP_404, HTTP_505 } = ChromeUtils.import(
   "chrome://remote/content/server/HTTPD.jsm"
 );
-const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
 const { Protocol } = ChromeUtils.import("chrome://remote/content/Protocol.jsm");
 const { RemoteAgentError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"

diff --git a/remote/RemoteAgent.jsm b/remote/RemoteAgent.jsm
@@ -14,7 +14,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   HttpServer: "chrome://remote/content/server/HTTPD.jsm",
   JSONHandler: "chrome://remote/content/JSONHandler.jsm",
-  Log: "chrome://remote/content/Log.jsm",
+  Log: "chrome://remote/content/shared/Log.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   RecommendedPreferences: "chrome://remote/content/RecommendedPreferences.jsm",
   TargetList: "chrome://remote/content/targets/TargetList.jsm",

diff --git a/remote/domains/content/Runtime.jsm b/remote/domains/content/Runtime.jsm
@@ -18,7 +18,9 @@ const { ContentProcessDomain } = ChromeUtils.import(
 const { ExecutionContext } = ChromeUtils.import(
   "chrome://remote/content/domains/content/runtime/ExecutionContext.jsm"
 );
-const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { executeSoon } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 // Import the `Debugger` constructor in the current scope
 addDebuggerToGlobal(Cu.getGlobalForObject(this));

diff --git a/remote/domains/parent/Page.jsm b/remote/domains/parent/Page.jsm
@@ -33,12 +33,14 @@ const { UnsupportedError } = ChromeUtils.import(
 const { streamRegistry } = ChromeUtils.import(
   "chrome://remote/content/domains/parent/IO.jsm"
 );
-const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { PollPromise } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 const { TabManager } = ChromeUtils.import(
-  "chrome://remote/content/TabManager.jsm"
+  "chrome://remote/content/shared/TabManager.jsm"
 );
 const { WindowManager } = ChromeUtils.import(
-  "chrome://remote/content/WindowManager.jsm"
+  "chrome://remote/content/shared/WindowManager.jsm"
 );
 
 const MAX_CANVAS_DIMENSION = 32767;

diff --git a/remote/domains/parent/Target.jsm b/remote/domains/parent/Target.jsm
@@ -26,13 +26,13 @@ const { MainProcessTarget } = ChromeUtils.import(
   "chrome://remote/content/targets/MainProcessTarget.jsm"
 );
 const { TabManager } = ChromeUtils.import(
-  "chrome://remote/content/TabManager.jsm"
+  "chrome://remote/content/shared/TabManager.jsm"
 );
 const { TabSession } = ChromeUtils.import(
   "chrome://remote/content/sessions/TabSession.jsm"
 );
 const { WindowManager } = ChromeUtils.import(
-  "chrome://remote/content/WindowManager.jsm"
+  "chrome://remote/content/shared/WindowManager.jsm"
 );
 
 let browserContextIds = 1;

diff --git a/remote/jar.mn b/remote/jar.mn
@@ -8,15 +8,10 @@ remote.jar:
 
   content/Connection.jsm (Connection.jsm)
   content/Error.jsm (Error.jsm)
-  content/Format.jsm (Format.jsm)
   content/JSONHandler.jsm (JSONHandler.jsm)
-  content/Log.jsm (Log.jsm)
   content/Protocol.jsm (Protocol.jsm)
   content/RecommendedPreferences.jsm (RecommendedPreferences.jsm)
   content/StreamRegistry.jsm (StreamRegistry.jsm)
-  content/Sync.jsm (Sync.jsm)
-  content/TabManager.jsm (TabManager.jsm)
-  content/WindowManager.jsm (WindowManager.jsm)
 
   # observers
   content/observers/ChannelEventSink.jsm (observers/ChannelEventSink.jsm)
@@ -68,5 +63,12 @@ remote.jar:
   content/server/WebSocketHandshake.jsm (server/WebSocketHandshake.jsm)
   content/server/WebSocketTransport.jsm (server/WebSocketTransport.jsm)
 
+  # shared modules
+  content/shared/Format.jsm (shared/Format.jsm)
+  content/shared/Log.jsm (shared/Log.jsm)
+  content/shared/Sync.jsm (shared/Sync.jsm)
+  content/shared/TabManager.jsm (shared/TabManager.jsm)
+  content/shared/WindowManager.jsm (shared/WindowManager.jsm)
+
   # imports from external folders
   content/external/EventUtils.js (../testing/mochitest/tests/SimpleTest/EventUtils.js)
diff --git a/remote/observers/ContextObserver.jsm b/remote/observers/ContextObserver.jsm
@@ -30,7 +30,9 @@ const { EventEmitter } = ChromeUtils.import(
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { executeSoon } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 class ContextObserver {
   constructor(chromeEventHandler) {

diff --git a/remote/observers/TargetObserver.jsm b/remote/observers/TargetObserver.jsm
@@ -6,7 +6,9 @@
 
 var EXPORTED_SYMBOLS = ["TabObserver"];
 
-const { EventPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { EventPromise } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 const { EventEmitter } = ChromeUtils.import(
   "resource://gre/modules/EventEmitter.jsm"
 );

diff --git a/remote/server/WebSocketHandshake.jsm b/remote/server/WebSocketHandshake.jsm
@@ -15,7 +15,9 @@ const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { executeSoon } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 XPCOMUtils.defineLazyGetter(this, "WebSocket", () => {
   return Services.appShell.hiddenDOMWindow.WebSocket;

diff --git a/remote/Format.jsm → remote/shared/Format.jsm b/remote/Format.jsm → remote/shared/Format.jsm
@@ -6,7 +6,7 @@
 
 var EXPORTED_SYMBOLS = ["pprint", "truncate"];
 
-const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(

diff --git a/remote/Log.jsm → remote/shared/Log.jsm b/remote/Log.jsm → remote/shared/Log.jsm
diff --git a/remote/Sync.jsm → remote/shared/Sync.jsm b/remote/Sync.jsm → remote/shared/Sync.jsm
diff --git a/remote/TabManager.jsm → remote/shared/TabManager.jsm b/remote/TabManager.jsm → remote/shared/TabManager.jsm
diff --git a/remote/WindowManager.jsm → remote/shared/WindowManager.jsm b/remote/WindowManager.jsm → remote/shared/WindowManager.jsm
@@ -7,7 +7,9 @@
 var EXPORTED_SYMBOLS = ["WindowManager"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { EventPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { EventPromise } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 var WindowManager = {
   async focus(window) {

diff --git a/remote/test/browser/page/head.js b/remote/test/browser/page/head.js
@@ -17,7 +17,9 @@ const {
   setTimeout,
 } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
-const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { PollPromise } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 const TIMEOUT_SET_HISTORY_INDEX = 1000;
 

diff --git a/remote/test/unit/test_Format.js b/remote/test/unit/test_Format.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const { truncate, pprint } = ChromeUtils.import(
-  "chrome://remote/content/Format.jsm"
+  "chrome://remote/content/shared/Format.jsm"
 );
 
 const MAX_STRING_LENGTH = 250;

diff --git a/remote/test/unit/test_Sync.js b/remote/test/unit/test_Sync.js
@@ -4,7 +4,9 @@
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
+const { PollPromise } = ChromeUtils.import(
+  "chrome://remote/content/shared/Sync.jsm"
+);
 
 /**
  * Mimic a DOM node for listening for events.