Bug 1326937 - Patch react-dom to avoid double load r=bgrins
☠☠ backed out by 8418d3ebb3a0 ☠ ☠
authorJan Odvarko <odvarko@gmail.com>
Thu, 15 Jun 2017 16:43:47 +0200
changeset 369188 57701c371c8de6b2ca9ccaa493a37d65ad1c9b4b
parent 369187 227ff88b9848499cb85432ef7ad9ae5c0cbe4249
child 369189 d99559a7adc7cc556575905fc6ddfe9b650ea6bb
push id46589
push userjodvarko@mozilla.com
push dateMon, 17 Jul 2017 17:29:02 +0000
treeherderautoland@d99559a7adc7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1326937
milestone56.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 1326937 - Patch react-dom to avoid double load r=bgrins MozReview-Commit-ID: CEMsI7CvqHS
devtools/client/shared/vendor/react-dom.js
--- a/devtools/client/shared/vendor/react-dom.js
+++ b/devtools/client/shared/vendor/react-dom.js
@@ -146,20 +146,22 @@
     // 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";
+    const webConsoleUrl = "chrome://devtools/content/webconsole/webconsole.xhtml";
 
     while (doc instanceof XULDocument ||
            doc.location.href === inspectorUrl ||
-           doc.location.href === netMonitorUrl) {
+           doc.location.href === netMonitorUrl ||
+           doc.location.href === webConsoleUrl) {
       const {frameElement} = doc.defaultView;
 
       if (!frameElement) {
         // We're at the root element, and no toolbox was found.
         return null;
       }
 
       doc = frameElement.parentElement.ownerDocument;