Bug 1649477 - Part 1: Move JSActor related files into their own directory, r=kmag
authorNika Layzell <nika@thelayzells.com>
Wed, 08 Jul 2020 14:22:22 +0000
changeset 539378 0ad359f8308b0c853822d9033276a80827e7df47
parent 539377 145740ac5efede9a7bcf4c6e1db4fe07bc24ecaf
child 539379 d3c935827ef7694b50f5b2d9fc2665d27f9c27c2
push id37579
push userdluca@mozilla.com
push dateWed, 08 Jul 2020 21:49:35 +0000
treeherdermozilla-central@ee89deeb4fb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskmag
bugs1649477
milestone80.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 1649477 - Part 1: Move JSActor related files into their own directory, r=kmag Differential Revision: https://phabricator.services.mozilla.com/D82100
dom/ipc/JSActor.cpp
dom/ipc/JSActor.h
dom/ipc/JSActorService.cpp
dom/ipc/JSActorService.h
dom/ipc/JSProcessActorChild.cpp
dom/ipc/JSProcessActorChild.h
dom/ipc/JSProcessActorParent.cpp
dom/ipc/JSProcessActorParent.h
dom/ipc/JSProcessActorProtocol.cpp
dom/ipc/JSProcessActorProtocol.h
dom/ipc/JSWindowActorChild.cpp
dom/ipc/JSWindowActorChild.h
dom/ipc/JSWindowActorParent.cpp
dom/ipc/JSWindowActorParent.h
dom/ipc/JSWindowActorProtocol.cpp
dom/ipc/JSWindowActorProtocol.h
dom/ipc/jsactor/JSActor.cpp
dom/ipc/jsactor/JSActor.h
dom/ipc/jsactor/JSActorService.cpp
dom/ipc/jsactor/JSActorService.h
dom/ipc/jsactor/JSProcessActorChild.cpp
dom/ipc/jsactor/JSProcessActorChild.h
dom/ipc/jsactor/JSProcessActorParent.cpp
dom/ipc/jsactor/JSProcessActorParent.h
dom/ipc/jsactor/JSProcessActorProtocol.cpp
dom/ipc/jsactor/JSProcessActorProtocol.h
dom/ipc/jsactor/JSWindowActorChild.cpp
dom/ipc/jsactor/JSWindowActorChild.h
dom/ipc/jsactor/JSWindowActorParent.cpp
dom/ipc/jsactor/JSWindowActorParent.h
dom/ipc/jsactor/JSWindowActorProtocol.cpp
dom/ipc/jsactor/JSWindowActorProtocol.h
dom/ipc/jsactor/moz.build
dom/ipc/moz.build
rename from dom/ipc/JSActor.cpp
rename to dom/ipc/jsactor/JSActor.cpp
rename from dom/ipc/JSActor.h
rename to dom/ipc/jsactor/JSActor.h
rename from dom/ipc/JSActorService.cpp
rename to dom/ipc/jsactor/JSActorService.cpp
rename from dom/ipc/JSActorService.h
rename to dom/ipc/jsactor/JSActorService.h
rename from dom/ipc/JSProcessActorChild.cpp
rename to dom/ipc/jsactor/JSProcessActorChild.cpp
--- a/dom/ipc/JSProcessActorChild.cpp
+++ b/dom/ipc/jsactor/JSProcessActorChild.cpp
@@ -2,16 +2,17 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* 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/. */
 
 #include "mozilla/dom/JSProcessActorBinding.h"
 #include "mozilla/dom/JSProcessActorChild.h"
 #include "mozilla/dom/InProcessChild.h"
+#include "mozilla/dom/InProcessParent.h"
 
 namespace mozilla {
 namespace dom {
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(JSProcessActorChild, JSActor, mManager)
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(JSProcessActorChild, JSActor)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
rename from dom/ipc/JSProcessActorChild.h
rename to dom/ipc/jsactor/JSProcessActorChild.h
rename from dom/ipc/JSProcessActorParent.cpp
rename to dom/ipc/jsactor/JSProcessActorParent.cpp
--- a/dom/ipc/JSProcessActorParent.cpp
+++ b/dom/ipc/jsactor/JSProcessActorParent.cpp
@@ -1,16 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* 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/. */
 
 #include "mozilla/dom/JSProcessActorBinding.h"
 #include "mozilla/dom/JSProcessActorParent.h"
+#include "mozilla/dom/InProcessChild.h"
+#include "mozilla/dom/InProcessParent.h"
 
 namespace mozilla {
 namespace dom {
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(JSProcessActorParent, JSActor, mManager)
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(JSProcessActorParent, JSActor)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
rename from dom/ipc/JSProcessActorParent.h
rename to dom/ipc/jsactor/JSProcessActorParent.h
rename from dom/ipc/JSProcessActorProtocol.cpp
rename to dom/ipc/jsactor/JSProcessActorProtocol.cpp
rename from dom/ipc/JSProcessActorProtocol.h
rename to dom/ipc/jsactor/JSProcessActorProtocol.h
rename from dom/ipc/JSWindowActorChild.cpp
rename to dom/ipc/jsactor/JSWindowActorChild.cpp
rename from dom/ipc/JSWindowActorChild.h
rename to dom/ipc/jsactor/JSWindowActorChild.h
rename from dom/ipc/JSWindowActorParent.cpp
rename to dom/ipc/jsactor/JSWindowActorParent.cpp
rename from dom/ipc/JSWindowActorParent.h
rename to dom/ipc/jsactor/JSWindowActorParent.h
rename from dom/ipc/JSWindowActorProtocol.cpp
rename to dom/ipc/jsactor/JSWindowActorProtocol.cpp
rename from dom/ipc/JSWindowActorProtocol.h
rename to dom/ipc/jsactor/JSWindowActorProtocol.h
new file mode 100644
--- /dev/null
+++ b/dom/ipc/jsactor/moz.build
@@ -0,0 +1,35 @@
+# -*- 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/.
+
+EXPORTS.mozilla.dom += [
+    'JSActor.h',
+    'JSActorService.h',
+    'JSProcessActorChild.h',
+    'JSProcessActorParent.h',
+    'JSProcessActorProtocol.h',
+    'JSWindowActorChild.h',
+    'JSWindowActorParent.h',
+    'JSWindowActorProtocol.h',
+]
+
+UNIFIED_SOURCES += [
+    'JSActor.cpp',
+    'JSActorService.cpp',
+    'JSProcessActorChild.cpp',
+    'JSProcessActorParent.cpp',
+    'JSProcessActorProtocol.cpp',
+    'JSWindowActorChild.cpp',
+    'JSWindowActorParent.cpp',
+    'JSWindowActorProtocol.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/src',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -2,16 +2,18 @@
 # 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/.
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "DOM: Content Processes")
 
+DIRS += ['jsactor']
+
 XPIDL_SOURCES += [
     'nsIDOMProcessChild.idl',
     'nsIDOMProcessParent.idl',
     'nsIHangReport.idl',
 ]
 
 XPIDL_MODULE = 'dom'
 
@@ -45,24 +47,16 @@ EXPORTS.mozilla.dom += [
     'ContentProcess.h',
     'ContentProcessManager.h',
     'CSPMessageUtils.h',
     'DocShellMessageUtils.h',
     'EffectsInfo.h',
     'FilePickerParent.h',
     'InProcessChild.h',
     'InProcessParent.h',
-    'JSActor.h',
-    'JSActorService.h',
-    'JSProcessActorChild.h',
-    'JSProcessActorParent.h',
-    'JSProcessActorProtocol.h',
-    'JSWindowActorChild.h',
-    'JSWindowActorParent.h',
-    'JSWindowActorProtocol.h',
     'MaybeDiscarded.h',
     'MemoryReportRequest.h',
     'PermissionMessageUtils.h',
     'ProcessActor.h',
     'PropertyBagUtils.h',
     'ReferrerInfoUtils.h',
     'RefMessageBodyService.h',
     'RemoteBrowser.h',
@@ -103,24 +97,16 @@ UNIFIED_SOURCES += [
     'ColorPickerParent.cpp',
     'ContentParent.cpp',
     'ContentProcess.cpp',
     'ContentProcessManager.cpp',
     'CSPMessageUtils.cpp',
     'DocShellMessageUtils.cpp',
     'FilePickerParent.cpp',
     'InProcessImpl.cpp',
-    'JSActor.cpp',
-    'JSActorService.cpp',
-    'JSProcessActorChild.cpp',
-    'JSProcessActorParent.cpp',
-    'JSProcessActorProtocol.cpp',
-    'JSWindowActorChild.cpp',
-    'JSWindowActorParent.cpp',
-    'JSWindowActorProtocol.cpp',
     'MemMapSnapshot.cpp',
     'MemoryReportRequest.cpp',
     'MMPrinter.cpp',
     'PermissionMessageUtils.cpp',
     'PreallocatedProcessManager.cpp',
     'ProcessActor.cpp',
     'ProcessPriorityManager.cpp',
     'PropertyBagUtils.cpp',