Bug 1308441 - Remove commonLibRequire trick r?honza draft
authorRicky Chien <ricky060709@gmail.com>
Mon, 06 Mar 2017 10:08:04 +0800
changeset 496387 63b32d9c8c36649b524ec22f0736c8a4f3c9885f
parent 496313 35398cae65c1526ce45c23a5f8b5568c5ada4762
child 496388 234be95ad6a63d2601a6dc775e3e0524a310636a
push id48583
push userbmo:rchien@mozilla.com
push dateFri, 10 Mar 2017 03:16:43 +0000
reviewershonza
bugs1308441
milestone55.0a1
Bug 1308441 - Remove commonLibRequire trick r?honza MozReview-Commit-ID: 2bTs19UK9dJ
devtools/client/netmonitor/netmonitor.js
devtools/client/shared/vendor/react-dom.js
--- a/devtools/client/netmonitor/netmonitor.js
+++ b/devtools/client/netmonitor/netmonitor.js
@@ -8,17 +8,16 @@
 
 const { BrowserLoader } = Components.utils.import("resource://devtools/client/shared/browser-loader.js", {});
 
 var Netmonitor = {
   bootstrap: ({ tabTarget, toolbox }) => {
     const require = window.windowRequire = BrowserLoader({
       baseURI: "resource://devtools/client/netmonitor/",
       window,
-      commonLibRequire: toolbox.browserRequire,
     }).require;
 
     const EventEmitter = require("devtools/shared/event-emitter");
     const { createFactory } = require("devtools/client/shared/vendor/react");
     const { render } = require("devtools/client/shared/vendor/react-dom");
     const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
     const { configureStore } = require("./store");
     const store = window.gStore = configureStore();
--- a/devtools/client/shared/vendor/react-dom.js
+++ b/devtools/client/shared/vendor/react-dom.js
@@ -145,21 +145,18 @@
   function getToolboxDocIfXulOnly(node) {
     // This execution context doesn't know about XULDocuments, so don't get the toolbox.
     if (typeof XULDocument !== "function") {
       return null;
     }
 
     let doc = node.ownerDocument;
     const inspectorUrl = "chrome://devtools/content/inspector/inspector.xhtml";
-    const netMonitorUrl = "chrome://devtools/content/netmonitor/netmonitor.xhtml";
 
-    while (doc instanceof XULDocument ||
-           doc.location.href === inspectorUrl ||
-           doc.location.href === netMonitorUrl) {
+    while (doc instanceof XULDocument || doc.location.href === inspectorUrl) {
       const {frameElement} = doc.defaultView;
 
       if (!frameElement) {
         // We're at the root element, and no toolbox was found.
         return null;
       }
 
       doc = frameElement.parentElement.ownerDocument;