From 48611527666a2b26fe69626baec000d7ae693db1 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Wed, 11 Dec 2019 17:53:46 -0800
Subject: [PATCH] browser(firefox): instrument document.open load event (#218)

---
 browser_patches/firefox/BUILD_NUMBER          |  2 +-
 .../firefox/patches/bootstrap.diff            | 34 ++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER
index 59c1122662..49bc2728c7 100644
--- a/browser_patches/firefox/BUILD_NUMBER
+++ b/browser_patches/firefox/BUILD_NUMBER
@@ -1 +1 @@
-1004
+1005
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index eca10c1c70..171e5e101c 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1780,10 +1780,10 @@ index 000000000000..2508cce41565
 +
 diff --git a/testing/juggler/content/PageAgent.js b/testing/juggler/content/PageAgent.js
 new file mode 100644
-index 000000000000..daec73796e3b
+index 000000000000..266fad046ba2
 --- /dev/null
 +++ b/testing/juggler/content/PageAgent.js
-@@ -0,0 +1,649 @@
+@@ -0,0 +1,661 @@
 +"use strict";
 +const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 +const Ci = Components.interfaces;
@@ -1909,6 +1909,7 @@ index 000000000000..daec73796e3b
 +      helper.addObserver(this._onDOMWindowCreated.bind(this), 'content-document-global-created'),
 +      helper.addEventListener(this._session.mm(), 'DOMContentLoaded', this._onDOMContentLoaded.bind(this)),
 +      helper.addEventListener(this._session.mm(), 'pageshow', this._onLoad.bind(this)),
++      helper.addObserver(this._onDocumentOpenLoad.bind(this), 'juggler-document-open-loaded'),
 +      helper.addEventListener(this._session.mm(), 'error', this._onError.bind(this)),
 +      helper.on(this._frameTree, 'frameattached', this._onFrameAttached.bind(this)),
 +      helper.on(this._frameTree, 'framedetached', this._onFrameDetached.bind(this)),
@@ -1956,6 +1957,17 @@ index 000000000000..daec73796e3b
 +    });
 +  }
 +
++  _onDocumentOpenLoad(document) {
++    const docShell = document.ownerGlobal.docShell;
++    const frame = this._frameTree.frameForDocShell(docShell);
++    if (!frame)
++      return;
++    this._session.emitEvent('Page.eventFired', {
++      frameId: frame.id(),
++      name: 'load'
++    });
++  }
++
 +  _onLoad(event) {
 +    const docShell = event.target.ownerGlobal.docShell;
 +    const frame = this._frameTree.frameForDocShell(docShell);
@@ -4959,10 +4971,24 @@ index 79d6eeed7247..0362763ead99 100644
      ]
  
 diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
-index 92cb5f3cf6da..7918f127c801 100644
+index 92cb5f3cf6da..bfcb01b08156 100644
 --- a/uriloader/base/nsDocLoader.cpp
 +++ b/uriloader/base/nsDocLoader.cpp
-@@ -1370,6 +1370,24 @@ void nsDocLoader::FireOnLocationChange(nsIWebProgress* aWebProgress,
+@@ -763,6 +763,13 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout) {
+                         ("DocLoader:%p: Firing load event for document.open\n",
+                          this));
+ 
++                nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
++                if (os) {
++                  nsIPrincipal* principal = doc->NodePrincipal();
++                  if (!nsContentUtils::IsSystemPrincipal(principal))
++                    os->NotifyObservers(ToSupports(doc), "juggler-document-open-loaded", nullptr);
++                }
++
+                 // This is a very cut-down version of
+                 // nsDocumentViewer::LoadComplete that doesn't do various things
+                 // that are not relevant here because this wasn't an actual
+@@ -1370,6 +1377,24 @@ void nsDocLoader::FireOnLocationChange(nsIWebProgress* aWebProgress,
    }
  }