Bug 883377 - Part 6: Update browser and dom tests to follow displayName change. r=smaug

This commit is contained in:
Tooru Fujisawa 2016-12-03 07:44:23 +09:00
parent be551e20bb
commit ca98c3a8c4
2 changed files with 11 additions and 11 deletions

View File

@ -10,15 +10,15 @@ const EXPECTED_REFLOWS = [
// Loading a tab causes a reflow. // Loading a tab causes a reflow.
"loadTabs@chrome://browser/content/tabbrowser.xml|" + "loadTabs@chrome://browser/content/tabbrowser.xml|" +
"loadOneOrMoreURIs@chrome://browser/content/browser.js|" + "loadOneOrMoreURIs@chrome://browser/content/browser.js|" +
"gBrowserInit._delayedStartup@chrome://browser/content/browser.js|", "_delayedStartup@chrome://browser/content/browser.js|",
// Selecting the address bar causes a reflow. // Selecting the address bar causes a reflow.
"select@chrome://global/content/bindings/textbox.xml|" + "select@chrome://global/content/bindings/textbox.xml|" +
"focusAndSelectUrlBar@chrome://browser/content/browser.js|" + "focusAndSelectUrlBar@chrome://browser/content/browser.js|" +
"gBrowserInit._delayedStartup@chrome://browser/content/browser.js|", "_delayedStartup@chrome://browser/content/browser.js|",
// Focusing the content area causes a reflow. // Focusing the content area causes a reflow.
"gBrowserInit._delayedStartup@chrome://browser/content/browser.js|", "_delayedStartup@chrome://browser/content/browser.js|",
// Sometimes sessionstore collects data during this test, which causes a sync reflow // Sometimes sessionstore collects data during this test, which causes a sync reflow
// (https://bugzilla.mozilla.org/show_bug.cgi?id=892154 will fix this) // (https://bugzilla.mozilla.org/show_bug.cgi?id=892154 will fix this)
@ -29,23 +29,23 @@ if (Services.appinfo.OS == "WINNT" || Services.appinfo.OS == "Darwin") {
// TabsInTitlebar._update causes a reflow on OS X and Windows trying to do calculations // TabsInTitlebar._update causes a reflow on OS X and Windows trying to do calculations
// since layout info is already dirty. This doesn't seem to happen before // since layout info is already dirty. This doesn't seem to happen before
// MozAfterPaint on Linux. // MozAfterPaint on Linux.
EXPECTED_REFLOWS.push("TabsInTitlebar._update/rect@chrome://browser/content/browser-tabsintitlebar.js|" + EXPECTED_REFLOWS.push("rect@chrome://browser/content/browser-tabsintitlebar.js|" +
"TabsInTitlebar._update@chrome://browser/content/browser-tabsintitlebar.js|" + "_update@chrome://browser/content/browser-tabsintitlebar.js|" +
"updateAppearance@chrome://browser/content/browser-tabsintitlebar.js|" + "updateAppearance@chrome://browser/content/browser-tabsintitlebar.js|" +
"handleEvent@chrome://browser/content/tabbrowser.xml|"); "handleEvent@chrome://browser/content/tabbrowser.xml|");
} }
if (Services.appinfo.OS == "Darwin") { if (Services.appinfo.OS == "Darwin") {
// _onOverflow causes a reflow getting widths. // _onOverflow causes a reflow getting widths.
EXPECTED_REFLOWS.push("OverflowableToolbar.prototype._onOverflow@resource:///modules/CustomizableUI.jsm|" + EXPECTED_REFLOWS.push("_onOverflow@resource:///modules/CustomizableUI.jsm|" +
"OverflowableToolbar.prototype.init@resource:///modules/CustomizableUI.jsm|" + "init@resource:///modules/CustomizableUI.jsm|" +
"OverflowableToolbar.prototype.observe@resource:///modules/CustomizableUI.jsm|" + "observe@resource:///modules/CustomizableUI.jsm|" +
"gBrowserInit._delayedStartup@chrome://browser/content/browser.js|"); "_delayedStartup@chrome://browser/content/browser.js|");
// Same as above since in packaged builds there are no function names and the resource URI includes "app" // Same as above since in packaged builds there are no function names and the resource URI includes "app"
EXPECTED_REFLOWS.push("@resource://app/modules/CustomizableUI.jsm|" + EXPECTED_REFLOWS.push("@resource://app/modules/CustomizableUI.jsm|" +
"@resource://app/modules/CustomizableUI.jsm|" + "@resource://app/modules/CustomizableUI.jsm|" +
"@resource://app/modules/CustomizableUI.jsm|" + "@resource://app/modules/CustomizableUI.jsm|" +
"gBrowserInit._delayedStartup@chrome://browser/content/browser.js|"); "_delayedStartup@chrome://browser/content/browser.js|");
} }
/* /*

View File

@ -93,7 +93,7 @@ doTest@${ourFile}:56:7
checkExn.bind(null, 90, "ReferenceError", checkExn.bind(null, 90, "ReferenceError",
"thereIsNoSuchContentFunction3 is not defined", "thereIsNoSuchContentFunction3 is not defined",
undefined, ourFile, 6, undefined, ourFile, 6,
`doTest/<.then@${ourFile}:90:32 `then@${ourFile}:90:32
` + (asyncStack ? `Async*doTest@${ourFile}:89:7\n` + parentFrame : ""))), ` + (asyncStack ? `Async*doTest@${ourFile}:89:7\n` + parentFrame : ""))),
t.testPromiseWithDOMExceptionThrowingPromiseInit().then( t.testPromiseWithDOMExceptionThrowingPromiseInit().then(
ensurePromiseFail.bind(null, 7), ensurePromiseFail.bind(null, 7),