Bug 1151909 - Wait for DOMContentLoaded draft
authorAlexandre Poirot <poirot.alex@gmail.com>
Wed, 09 Nov 2016 09:34:00 -0800
changeset 438446 ba0e37bacc4004103f4227704172d7cb4c3fcbf4
parent 438445 1cd8f59d213ca8c6fdaa080329e4b62878a73bc5
child 438447 1a3bb0eb6de061d3c97f78e4dc3eb23c65c9ca0e
push id35725
push userbmo:poirot.alex@gmail.com
push dateMon, 14 Nov 2016 15:41:49 +0000
bugs1151909
milestone52.0a1
Bug 1151909 - Wait for DOMContentLoaded MozReview-Commit-ID: HGKns35JX75
devtools/server/actors/inspector.js
--- a/devtools/server/actors/inspector.js
+++ b/devtools/server/actors/inspector.js
@@ -2342,16 +2342,23 @@ var WalkerActor = protocol.ActorClassWit
       type: "inlineTextChild",
       target: parentActor.actorID,
       inlineTextChild:
         inlineTextChild ? inlineTextChild.form() : undefined
     });
   },
 
   onFrameLoad: function ({ window, isTopLevel }) {
+    let { readyState } = window.document;
+    if (readyState != "interactive" && readyState != "complete") {
+      window.addEventListener("DOMContentLoaded",
+        this.onFrameLoad.bind(this, { window, isTopLevel }),
+        { once: true });
+      return;
+    }
     if (isTopLevel) {
       // If we initialize the inspector while the document is loading,
       // we may already have a root document set in the constructor.
       if (this.rootDoc && !Cu.isDeadWrapper(this.rootDoc) &&
           this.rootDoc.defaultView) {
         this.onFrameUnload({ window: this.rootDoc.defaultView });
       }
       this.rootDoc = window.document;