From 021bff6bf86a214f5e28b7adde7fc0a5956eab40 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 23 Feb 2020 10:38:36 -0500
Subject: [PATCH] Follow-up to 4e2e9be6a - Move HeapSnapshot DevTools-only
 Modules back to DevTools

I am so done with this.

Resolves #316
---
 .../shared}/heapsnapshot/CensusUtils.js           |  0
 .../shared}/heapsnapshot/DominatorTreeNode.js     |  0
 .../shared}/heapsnapshot/HeapAnalysesClient.js    |  0
 .../shared}/heapsnapshot/HeapAnalysesWorker.js    |  0
 .../shared}/heapsnapshot/HeapSnapshotFileUtils.js |  0
 .../shared}/heapsnapshot/census-tree-node.js      |  0
 devtools/shared/heapsnapshot/moz.build            | 15 +++++++++++++++
 .../shared}/heapsnapshot/shortest-paths.js        |  0
 devtools/shared/moz.build                         |  1 +
 dom/heapsnapshot/moz.build                        | 11 -----------
 10 files changed, 16 insertions(+), 11 deletions(-)
 rename {dom => devtools/shared}/heapsnapshot/CensusUtils.js (100%)
 rename {dom => devtools/shared}/heapsnapshot/DominatorTreeNode.js (100%)
 rename {dom => devtools/shared}/heapsnapshot/HeapAnalysesClient.js (100%)
 rename {dom => devtools/shared}/heapsnapshot/HeapAnalysesWorker.js (100%)
 rename {dom => devtools/shared}/heapsnapshot/HeapSnapshotFileUtils.js (100%)
 rename {dom => devtools/shared}/heapsnapshot/census-tree-node.js (100%)
 create mode 100644 devtools/shared/heapsnapshot/moz.build
 rename {dom => devtools/shared}/heapsnapshot/shortest-paths.js (100%)

diff --git a/dom/heapsnapshot/CensusUtils.js b/devtools/shared/heapsnapshot/CensusUtils.js
similarity index 100%
rename from dom/heapsnapshot/CensusUtils.js
rename to devtools/shared/heapsnapshot/CensusUtils.js
diff --git a/dom/heapsnapshot/DominatorTreeNode.js b/devtools/shared/heapsnapshot/DominatorTreeNode.js
similarity index 100%
rename from dom/heapsnapshot/DominatorTreeNode.js
rename to devtools/shared/heapsnapshot/DominatorTreeNode.js
diff --git a/dom/heapsnapshot/HeapAnalysesClient.js b/devtools/shared/heapsnapshot/HeapAnalysesClient.js
similarity index 100%
rename from dom/heapsnapshot/HeapAnalysesClient.js
rename to devtools/shared/heapsnapshot/HeapAnalysesClient.js
diff --git a/dom/heapsnapshot/HeapAnalysesWorker.js b/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
similarity index 100%
rename from dom/heapsnapshot/HeapAnalysesWorker.js
rename to devtools/shared/heapsnapshot/HeapAnalysesWorker.js
diff --git a/dom/heapsnapshot/HeapSnapshotFileUtils.js b/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
similarity index 100%
rename from dom/heapsnapshot/HeapSnapshotFileUtils.js
rename to devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
diff --git a/dom/heapsnapshot/census-tree-node.js b/devtools/shared/heapsnapshot/census-tree-node.js
similarity index 100%
rename from dom/heapsnapshot/census-tree-node.js
rename to devtools/shared/heapsnapshot/census-tree-node.js
diff --git a/devtools/shared/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build
new file mode 100644
index 0000000000..9a915e4268
--- /dev/null
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -0,0 +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(
+    'census-tree-node.js',
+    'CensusUtils.js',
+    'DominatorTreeNode.js',
+    'HeapAnalysesClient.js',
+    'HeapAnalysesWorker.js',
+    'HeapSnapshotFileUtils.js',
+    'shortest-paths.js',
+)
diff --git a/dom/heapsnapshot/shortest-paths.js b/devtools/shared/heapsnapshot/shortest-paths.js
similarity index 100%
rename from dom/heapsnapshot/shortest-paths.js
rename to devtools/shared/heapsnapshot/shortest-paths.js
diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build
index 9dd4a20d65..e4de1d84a5 100644
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -14,6 +14,7 @@ DIRS += [
     'discovery',
     'fronts',
     'gcli',
+    'heapsnapshot',
     'inspector',
     'jsbeautify',
     'layout',
diff --git a/dom/heapsnapshot/moz.build b/dom/heapsnapshot/moz.build
index fa9ef39154..3fb6b0552b 100644
--- a/dom/heapsnapshot/moz.build
+++ b/dom/heapsnapshot/moz.build
@@ -48,16 +48,5 @@ DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['MOZ_DEVTOOLS_SERVER']:
-    DevToolsModules(
-        'census-tree-node.js',
-        'CensusUtils.js',
-        'DominatorTreeNode.js',
-        'HeapAnalysesClient.js',
-        'HeapAnalysesWorker.js',
-        'HeapSnapshotFileUtils.js',
-        'shortest-paths.js',
-    )
-
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']