Backed out 4 changesets (bug 1648858) for SM bustages. CLOSED TREE

Backed out changeset 5a612e42b77d (bug 1648858) Backed out changeset 3a1b5e883a4e (bug 1648858) Backed out changeset 816eaac72512 (bug 1648858) Backed out changeset 8ae692d68b1b (bug 1648858)
dothq · Jul 2, 2020 · 3dc54da · 3dc54da
1 parent 73b2b14
commit 3dc54da
Show file tree

Hide file tree

Showing 16 changed files with 1,020 additions and 1,380 deletions.
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -178,8 +178,6 @@ var whitelist = [
   },
   // Bug 1356031 (only used by devtools)
   { file: "chrome://global/skin/icons/error-16.png" },
-  // Bug 1641777 (only used by devtools)
-  { file: "chrome://global/content/third_party/d3/d3.js" },
   // Bug 1344267
   { file: "chrome://marionette/content/test.xhtml" },
   { file: "chrome://marionette/content/test_dialog.properties" },

diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
@@ -4,6 +4,7 @@
 
 devtools.jar:
 %   content devtools %content/
+    content/shared/vendor/d3.js (shared/vendor/d3.js)
     content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
     content/shared/widgets/widgets.css (shared/widgets/widgets.css)
     content/webconsole/index.html (webconsole/index.html)

diff --git a/devtools/client/memory/index.xhtml b/devtools/client/memory/index.xhtml
@@ -23,7 +23,7 @@
             defer="true">
     </script>
 
-    <script src="chrome://global/content/third_party/d3/d3.js"
+    <script src="chrome://devtools/content/shared/vendor/d3.js"
             defer="true">
     </script>
 

diff --git a/devtools/client/memory/test/browser/browser_memory_tree_map-01.js b/devtools/client/memory/test/browser/browser_memory_tree_map-01.js
@@ -9,7 +9,7 @@
 const CanvasUtils = require("devtools/client/memory/components/tree-map/canvas-utils");
 const D3_SCRIPT =
   '<script type="application/javascript" ' +
-  'src="chrome://global/content/third_party/d3/d3.js">';
+  'src="chrome://devtools/content/shared/vendor/d3.js>';
 const TEST_URL = `data:text/html,<html><body>${D3_SCRIPT}</body></html>`;
 
 this.test = makeMemoryTest(TEST_URL, async function({ tab, panel }) {

diff --git a/devtools/client/memory/test/chrome/test_ShortestPaths_01.html b/devtools/client/memory/test/chrome/test_ShortestPaths_01.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
     <script type="application/javascript"
-            src="chrome://global/content/third_party/d3/d3.js">
+            src="chrome://devtools/content/shared/vendor/d3.js">
     </script>
     <script type="application/javascript"
             src="chrome://devtools/content/shared/vendor/dagre-d3.js">

diff --git a/devtools/client/memory/test/chrome/test_ShortestPaths_02.html b/devtools/client/memory/test/chrome/test_ShortestPaths_02.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
     <script type="application/javascript"
-            src="chrome://global/content/third_party/d3/d3.js">
+            src="chrome://devtools/content/shared/vendor/d3.js">
     </script>
     <script type="application/javascript"
             src="chrome://devtools/content/shared/vendor/dagre-d3.js">

diff --git a/devtools/client/memory/test/chrome/test_TreeMap_01.html b/devtools/client/memory/test/chrome/test_TreeMap_01.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
     <script type="application/javascript"
-            src="chrome://global/content/third_party/d3/d3.js">
+            src="chrome://devtools/content/shared/vendor/d3.js">
     </script>
 </head>
 <body>