Commit 3dc54daa authored by Razvan Maries's avatar Razvan Maries
Browse files

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)
parent 73b2b140

browser/base/content/test/static/browser_all_files_referenced.js

+0 −2
Original line number Diff line number Diff line
@@ -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" },

devtools/client/jar.mn

+1 −0
Original line number Diff line number Diff line
@@ -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)

devtools/client/memory/index.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -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>

devtools/client/memory/test/browser/browser_memory_tree_map-01.js

+1 −1
Original line number Diff line number Diff line
@@ -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 }) {

devtools/client/memory/test/chrome/test_ShortestPaths_01.html

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Test that the ShortestPaths component properly renders a graph of the merged sho 
    <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">