From c8e3eee3aa525ab70bae72585d4174be3caaa5ac Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 26 Nov 2015 22:37:52 +0200
Subject: [PATCH] Bug 789315, notify MutationObservers before running <script>,
 r=khuey

---
 dom/base/nsScriptLoader.cpp                   |  5 ++
 dom/base/test/mochitest.ini                   |  1 +
 dom/base/test/test_bug789315.html             | 49 +++++++++++++++++++
 .../nodes/MutationObserver-document.html.ini  | 11 -----
 4 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 dom/base/test/test_bug789315.html
 delete mode 100644 testing/web-platform/meta/dom/nodes/MutationObserver-document.html.ini
diff --git a/dom/base/nsScriptLoader.cpp b/dom/base/nsScriptLoader.cpp
index da6da2538de..d480b4f1b23 100644
--- a/dom/base/nsScriptLoader.cpp
+++ b/dom/base/nsScriptLoader.cpp
@@ -969,6 +969,11 @@ nsScriptLoader::ProcessRequest(nsScriptLoadRequest* aRequest)
   // The window may have gone away by this point, in which case there's no point
   // in trying to run the script.
   nsCOMPtr<nsIDocument> master = mDocument->MasterDocument();
+  {
+    // Try to perform a microtask checkpoint
+    nsAutoMicroTask mt;
+  }
+
   nsPIDOMWindow *pwin = master->GetInnerWindow();
   bool runScript = !!pwin;
   if (runScript) {
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index a532483cf51..5cacec5794f 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -677,6 +677,7 @@ skip-if = os == "mac" # fails intermittently - bug 1101288
 [test_bug761120.html]
 [test_bug782342.html]
 [test_bug787778.html]
+[test_bug789315.html]
 [test_bug789856.html]
 [test_bug804395.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 901343, specialpowers.wrap issue createsystemxhr
diff --git a/dom/base/test/test_bug789315.html b/dom/base/test/test_bug789315.html
new file mode 100644
index 00000000000..e3081f36e3b
--- /dev/null
+++ b/dom/base/test/test_bug789315.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=789315
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 789315</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+    <script type="text/javascript">
+      (function() {
+        const observerConfig = {
+          childList: true,
+        };
+
+        var observer = new MutationObserver(onMutations);
+        observer.observe(document.head, observerConfig);
+
+        function onMutations(mutations) {
+          for (var i in mutations) {
+            var mutation = mutations[i];
+            for (var j in mutation.addedNodes) {
+              var addedNode = mutation.addedNodes[j];
+              addedNode.mutationObserverHasNotified = true;
+            }
+          }
+        }
+
+      })();
+    </script>
+
+    <link id="testnode" rel="localization" href="dummy"></link>
+
+    <script type="text/javascript">
+      var testNode = document.getElementById("testnode");
+      ok(testNode.mutationObserverHasNotified);
+    </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=789315">Mozilla Bug 789315</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff --git a/testing/web-platform/meta/dom/nodes/MutationObserver-document.html.ini b/testing/web-platform/meta/dom/nodes/MutationObserver-document.html.ini
deleted file mode 100644
index 1b5555582d7..00000000000
--- a/testing/web-platform/meta/dom/nodes/MutationObserver-document.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[MutationObserver-document.html]
-  type: testharness
-  [parser insertion mutations]
-    expected: FAIL
-
-  [parser script insertion mutation]
-    expected: FAIL
-
-  [removal of parent during parsing]
-    expected: FAIL
-
