Bug 1191412 - Fix logic and text for the WillChange warning. r=roc

This commit is contained in:
Benoit Girard 2015-08-07 16:05:19 -04:00
parent d2c0fcc803
commit a0aa67cb00
3 changed files with 6 additions and 6 deletions

View File

@ -10,4 +10,4 @@
* designed to be used as input to the C preprocessor *only*.
*/
DOCUMENT_WARNING(WillChangeOverBudgetIgnored)
DOCUMENT_WARNING(IgnoringWillChangeOverBudget)

View File

@ -155,8 +155,8 @@ ImportXULIntoContentWarning=Importing XUL nodes into a content document is depre
XMLDocumentLoadPrincipalMismatch=Use of document.load forbidden on Documents that come from other Windows. Only the Window in which a Document was created is allowed to call .load on that Document. Preferably, use XMLHttpRequest instead.
# LOCALIZATION NOTE: Do not translate "IndexedDB".
IndexedDBTransactionAbortNavigation=An IndexedDB transaction that was not yet complete has been aborted due to page navigation.
# LOCALIZATION NOTE: Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
WillChangeOverBudgetIgnoredWarning=Will-change memory consumption is too high. Surface area covers %1$S px, budget is the document surface area multiplied by %2$S (%3$S px). Occurences of will-change over the budget will be ignored.
# LOCALIZATION NOTE: Do not translate Will-change, %1$S,%2$S are numbers.
IgnoringWillChangeOverBudgetWarning=Will-change memory consumption is too high. Budget limit is the document surface area multiplied by %1$S (%2$S px). Occurrences of will-change over the budget will be ignored.
# LOCALIZATION NOTE: Do not translate "ServiceWorker".
HittingMaxWorkersPerDomain=A ServiceWorker could not be started immediately because other documents in the same origin are already using the maximum number of workers. The ServiceWorker is now queued and will be started after some of the other workers have completed.
# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"

View File

@ -1230,7 +1230,7 @@ nsDisplayListBuilder::IsInWillChangeBudget(nsIFrame* aFrame,
const nsSize& aSize) {
bool onBudget = AddToWillChangeBudget(aFrame, aSize);
if (onBudget) {
if (!onBudget) {
nsString usageStr;
usageStr.AppendInt(GetWillChangeCost(aFrame, aSize));
@ -1243,9 +1243,9 @@ nsDisplayListBuilder::IsInWillChangeBudget(nsIFrame* aFrame,
nsPresContext::AppUnitsToIntCSSPixels(area.height);
limitStr.AppendInt(budgetLimit);
const char16_t* params[] = { usageStr.get(), multiplierStr.get(), limitStr.get() };
const char16_t* params[] = { multiplierStr.get(), limitStr.get() };
aFrame->PresContext()->Document()->WarnOnceAbout(
nsIDocument::eWillChangeOverBudgetIgnored, false,
nsIDocument::eIgnoringWillChangeOverBudget, false,
params, ArrayLength(params));
}
return onBudget;