mozilla-central: changeset 214105:aad11b8e24c36e2c6362449301b1bb02d471fd0f

author	Carsten "Tomcat" Book <cbook@mozilla.com>
	Wed, 05 Nov 2014 15:19:53 +0100
changeset 214105	aad11b8e24c36e2c6362449301b1bb02d471fd0f
parent 214104	1505c9f42b2ff73efd1a54ff74f3c33a73bac66c
child 214106	3ad6929d95718719d1eee04c4ba3cee3f75b510c
push id	27771
push user	ryanvm@gmail.com
push date	Wed, 05 Nov 2014 19:04:24 +0000
treeherder	mozilla-central@305b4fecce99 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1093028
milestone	36.0a1
backs out	1f590c2c40f0b850c4062ee651e1fb21a76dff8e
first release with	nightly linux32 2114ef80f6ae / 36.0a1 / 20141106030201 / files nightly linux64 2114ef80f6ae / 36.0a1 / 20141106030201 / files nightly mac 2114ef80f6ae / 36.0a1 / 20141106030201 / files nightly win32 2114ef80f6ae / 36.0a1 / 20141106030201 / files nightly win64 2114ef80f6ae / 36.0a1 / 20141106030201 / files
last release without	nightly linux32 62990ec7ad78 / 36.0a1 / 20141105030203 / files nightly linux64 62990ec7ad78 / 36.0a1 / 20141105030203 / files nightly mac 62990ec7ad78 / 36.0a1 / 20141105030203 / files nightly win32 62990ec7ad78 / 36.0a1 / 20141105030203 / files nightly win64 62990ec7ad78 / 36.0a1 / 20141105030203 / files

--- a/dom/base/ImportManager.cpp
+++ b/dom/base/ImportManager.cpp
@@ -144,17 +144,16 @@ ImportLoader::Updater::UpdateMainReferre
   // This new link means we have to execute our scripts sooner...
   // Let's make sure that unblocking a loader does not trigger a script execution.
   // So we start with placing the new blockers and only then will we remove any
   // blockers.
   if (mLoader->IsBlocking()) {
     // Our import parent is changed, let's block the new one and later unblock
     // the old one.
     newMainReferrer->OwnerDoc()->ScriptLoader()->AddExecuteBlocker();
-    newMainReferrer->OwnerDoc()->BlockDOMContentLoaded();
   }
 
   if (mLoader->mDocument) {
     // Our nearest predecessor has changed. So let's add the ScriptLoader to the
     // new one if there is any. And remove it from the old one.
     nsRefPtr<ImportManager> manager = mLoader->Manager();
     nsScriptLoader* loader = mLoader->mDocument->ScriptLoader();
     ImportLoader*& pred = mLoader->mBlockingPredecessor;
@@ -164,17 +163,16 @@ ImportLoader::Updater::UpdateMainReferre
         newPred->AddBlockedScriptLoader(loader);
       }
       pred->RemoveBlockedScriptLoader(loader);
     }
   }
 
   if (mLoader->IsBlocking()) {
     mLoader->mImportParent->ScriptLoader()->RemoveExecuteBlocker();
-    mLoader->mImportParent->UnblockDOMContentLoaded();
   }
 
   // Finally update mMainReferrer to point to the newly added link.
   mLoader->mMainReferrer = aNewIdx;
   mLoader->mImportParent = newMainReferrer->OwnerDoc();
 }
 
 nsINode*
@@ -297,26 +295,24 @@ ImportLoader::ImportLoader(nsIURI* aURI,
 {
 }
 
 void
 ImportLoader::BlockScripts()
 {
   MOZ_ASSERT(!mBlockingScripts);
   mImportParent->ScriptLoader()->AddExecuteBlocker();
-  mImportParent->BlockDOMContentLoaded();
   mBlockingScripts = true;
 }
 
 void
 ImportLoader::UnblockScripts()
 {
   MOZ_ASSERT(mBlockingScripts);
   mImportParent->ScriptLoader()->RemoveExecuteBlocker();
-  mImportParent->UnblockDOMContentLoaded();
   for (uint32_t i = 0; i < mBlockedScriptLoaders.Length(); i++) {
     mBlockedScriptLoaders[i]->RemoveExecuteBlocker();
   }
   mBlockedScriptLoaders.Clear();
   mBlockingScripts = false;
 }
 
 void

deleted file mode 100644
--- a/dom/html/test/imports/file_blocking_DOMContentLoaded_A.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <script>
-    order.push("AS0");
-  </script>
-  <link rel="import" href="file_blocking_DOMContentLoaded_B.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-</body>
-</html>

deleted file mode 100644
--- a/dom/html/test/imports/file_blocking_DOMContentLoaded_B.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <script>
-    order.push("BS0");
-  </script>
-  <link rel="import" href="file_blocking_DOMContentLoaded_C.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-</body>
-</html>

deleted file mode 100644
--- a/dom/html/test/imports/file_blocking_DOMContentLoaded_C.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <script>
-    order.push("CS0");
-  </script>
-  <link rel="import" href="file_blocking_DOMContentLoaded_D.html" onload="loaded()" onerror="failed()"></link>
-</head>
-<body>
-</body>
-</html>

deleted file mode 100644
--- a/dom/html/test/imports/file_blocking_DOMContentLoaded_D.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <script>
-    order.push("DS0");
-  </script>
-</head>
-<body>
-</body>
-</html>

--- a/dom/html/test/imports/mochitest.ini
+++ b/dom/html/test/imports/mochitest.ini
@@ -28,25 +28,19 @@ support-files =
   file_cycle_3_C.html
   file_cycle_4_A.html
   file_cycle_4_B.html
   file_cycle_4_C.html
   file_cycle_4_D.html
   file_cycle_4_E.html
   file_encoding.html
   file_simple_import.html
-  file_blocking_DOMContentLoaded_A.html
-  file_blocking_DOMContentLoaded_B.html
-  file_blocking_DOMContentLoaded_C.html
-  file_blocking_DOMContentLoaded_D.html
 
 [test_cycle_1.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_2.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_3.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_cycle_4.html]
 skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
-[test_blocking_DOMContentLoaded.html]
-skip-if = toolkit == 'gonk' # nested imports fail on b2g emulator
 [test_encoding.html]
 [test_defaultView.html]

deleted file mode 100644
--- a/dom/html/test/imports/test_blocking_DOMContentLoaded.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1093028
--->
-<head>
-  <title>Test for Bug 1093028</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-</head>
-<body>
-  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1093028">Mozilla Bug 1093028</a>
-  <script type="text/javascript">
-    SimpleTest.waitForExplicitFinish();
-    var counter = 0;
-    var fcounter = 0;
-    var order = [];
-    function loaded() {
-      counter++;
-    }
-    function failed() {
-      fcounter++;
-    }
-  </script>
-  <link rel="import" href="file_blocking_DOMContentLoaded_A.html" onload="loaded()" onerror="failed()"></link>
-  <script type="text/javascript">
-    is(counter, 4, "Imports are loaded");
-    is(fcounter, 0, "No error in imports");
-    var expected = ["AS0","BS0","CS0","DS0"];
-    for (i in expected)
-      is(order[i], expected[i], "import " + i + " should be " + expected[i]);
-    SimpleTest.finish();
-  </script>
-</body>
-</html>

dom/base/ImportManager.cpp		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/file_blocking_DOMContentLoaded_A.html		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/file_blocking_DOMContentLoaded_B.html		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/file_blocking_DOMContentLoaded_C.html		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/file_blocking_DOMContentLoaded_D.html		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/mochitest.ini		file \| annotate \| diff \| comparison \| revisions
dom/html/test/imports/test_blocking_DOMContentLoaded.html		file \| annotate \| diff \| comparison \| revisions