author | Gijs Kruitbosch <gijskruitbosch@gmail.com> |
Tue, 08 Nov 2016 16:02:15 +0000 | |
changeset 321524 | d2baab775c7ee6b8f6f38d835ea10f6bdf323ffa |
parent 321523 | f3c84b1049871fcbf39298d22411ecbc8b3ba8dd |
child 321525 | 0d7eda3bfe639fbb69048e7f9ff8e0eca676c080 |
push id | 83633 |
push user | gijskruitbosch@gmail.com |
push date | Tue, 08 Nov 2016 16:02:36 +0000 |
treeherder | mozilla-inbound@d2baab775c7e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | trivial, me, firebot, DONTBUILD |
bugs | 1314812 |
milestone | 52.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
|
--- a/browser/base/content/test/general/head.js +++ b/browser/base/content/test/general/head.js @@ -623,18 +623,16 @@ function promiseTabLoadEvent(tab, url) info(`Skipping spurious load event for ${loadedUrl}`); return false; } info("Tab event received: load"); return true; } - // Create two promises: one resolved from the content process when the page - // loads and one that is rejected if we take too long to load the url. let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); if (url) BrowserTestUtils.loadURI(tab.linkedBrowser, url); return loaded; }
--- a/browser/base/content/test/plugins/head.js +++ b/browser/base/content/test/plugins/head.js @@ -85,18 +85,16 @@ function promiseTabLoadEvent(tab, url) { info(`Skipping spurious load event for ${loadedUrl}`); return false; } info("Tab event received: load"); return true; } - // Create two promises: one resolved from the content process when the page - // loads and one that is rejected if we take too long to load the url. let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); if (url) BrowserTestUtils.loadURI(tab.linkedBrowser, url); return loaded; }
--- a/browser/components/safebrowsing/content/test/head.js +++ b/browser/components/safebrowsing/content/test/head.js @@ -28,18 +28,16 @@ function promiseTabLoadEvent(tab, url, e info(`Skipping spurious load event for ${loadedUrl}`); return false; } info("Tab event received: load"); return true; } - // Create two promises: one resolved from the content process when the page - // loads and one that is rejected if we take too long to load the url. let loaded; if (eventType === "load") { loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); } else { // No need to use handle. loaded = BrowserTestUtils.waitForContentEvent(tab.linkedBrowser, eventType, true, undefined, true);
--- a/browser/components/search/test/head.js +++ b/browser/components/search/test/head.js @@ -107,18 +107,16 @@ function promiseTabLoadEvent(tab, url) info(`Skipping spurious load event for ${loadedUrl}`); return false; } info("Tab event received: load"); return true; } - // Create two promises: one resolved from the content process when the page - // loads and one that is rejected if we take too long to load the url. let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); if (url) BrowserTestUtils.loadURI(tab.linkedBrowser, url); return loaded; }