From d226aa9007352c4fe9b2178944a7e266dbab3abb Mon Sep 17 00:00:00 2001 From: Benoit Girard Date: Thu, 23 Jul 2015 11:54:45 -0400 Subject: [PATCH] Bug 1181976 - Rename WillChangeBudgetWarning in dom/dom.properties to reflect string change. r=flod --- dom/base/nsDocumentWarningList.h | 2 +- dom/locales/en-US/chrome/dom/dom.properties | 4 ++-- layout/base/nsDisplayList.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/base/nsDocumentWarningList.h b/dom/base/nsDocumentWarningList.h index 8a059ce5f91..943c19eb1b6 100644 --- a/dom/base/nsDocumentWarningList.h +++ b/dom/base/nsDocumentWarningList.h @@ -10,4 +10,4 @@ * designed to be used as input to the C preprocessor *only*. */ -DOCUMENT_WARNING(WillChangeBudget) +DOCUMENT_WARNING(WillChangeOverBudgetIgnored) diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties index b890862dcd4..0ae2f0d2ac9 100644 --- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -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 (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers. -WillChangeBudgetWarning=Will-change memory consumption is too high. Surface area covers %1$S pixels, budget is the document surface area multiplied by %2$S (%3$S pixels). Occurences of will-change over the budget will be ignored. +# 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 "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" diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index a41053ddbb6..2375f2e64c1 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -1245,7 +1245,7 @@ nsDisplayListBuilder::IsInWillChangeBudget(nsIFrame* aFrame, const char16_t* params[] = { usageStr.get(), multiplierStr.get(), limitStr.get() }; aFrame->PresContext()->Document()->WarnOnceAbout( - nsIDocument::eWillChangeBudget, false, + nsIDocument::eWillChangeOverBudgetIgnored, false, params, ArrayLength(params)); } return onBudget;