Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-05 22:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 374547, regression: unable to repeat xbl bound element inside another with the same binding r=jst,sr=bz

Browse Source
This commit is contained in:
Olli.Pettay@helsinki.fi 2007-04-01 05:19:44 -07:00
parent 4af4c5e9c0
commit cedf89817e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/xbl/src/nsXBLService.cpp
View File

@ -88,6 +88,8 @@
#include "nsIDOMLoadListener.h" #include "nsIDOMLoadListener.h"
#include "nsIDOMEventGroup.h" #include "nsIDOMEventGroup.h"
#define NS_MAX_XBL_BINDING_RECURSION 20
static PRBool IsChromeOrResourceURI(nsIURI* aURI) static PRBool IsChromeOrResourceURI(nsIURI* aURI)
{ {
PRBool isChrome = PR_FALSE; PRBool isChrome = PR_FALSE;
@ -107,6 +109,7 @@ IsAncestorBinding(nsIDocument* aDocument,
NS_ASSERTION(aChildBindingURI, "expected a binding URI"); NS_ASSERTION(aChildBindingURI, "expected a binding URI");
NS_ASSERTION(aChild, "expected a child content"); NS_ASSERTION(aChild, "expected a child content");
PRUint32 bindingRecursion = 0;
nsIContent* bindingParent = aChild->GetBindingParent(); nsIContent* bindingParent = aChild->GetBindingParent();
nsBindingManager* bindingManager = aDocument->BindingManager(); nsBindingManager* bindingManager = aDocument->BindingManager();
for (nsIContent* prev = aChild; for (nsIContent* prev = aChild;
@ -122,12 +125,16 @@ IsAncestorBinding(nsIDocument* aDocument,
&equal); &equal);
NS_ENSURE_SUCCESS(rv, PR_TRUE); // assume the worst NS_ENSURE_SUCCESS(rv, PR_TRUE); // assume the worst
if (equal) { if (equal) {
++bindingRecursion;
if (bindingRecursion < NS_MAX_XBL_BINDING_RECURSION) {
continue;
}
nsCAutoString spec; nsCAutoString spec;
aChildBindingURI->GetSpec(spec); aChildBindingURI->GetSpec(spec);
NS_ConvertUTF8toUTF16 bindingURI(spec); NS_ConvertUTF8toUTF16 bindingURI(spec);
const PRUnichar* params[] = { bindingURI.get() }; const PRUnichar* params[] = { bindingURI.get() };
nsContentUtils::ReportToConsole(nsContentUtils::eXBL_PROPERTIES, nsContentUtils::ReportToConsole(nsContentUtils::eXBL_PROPERTIES,
"RecursiveBinding", "TooDeepBindingRecursion",
params, NS_ARRAY_LENGTH(params), params, NS_ARRAY_LENGTH(params),
aDocument->GetDocumentURI(), aDocument->GetDocumentURI(),
EmptyString(), 0, 0, EmptyString(), 0, 0,

2
dom/locales/en-US/chrome/layout/xbl.properties
View File

@ -37,7 +37,7 @@ UnexpectedElement=Unexpected <%1$S> element.
# LOCALIZATION NOTE: do not localize key="%S" modifiers="%S" # LOCALIZATION NOTE: do not localize key="%S" modifiers="%S"
GTK2Conflict=Key event not available on GTK2: key="%S" modifiers="%S" GTK2Conflict=Key event not available on GTK2: key="%S" modifiers="%S"
WinConflict=Key event not available on some keyboard layouts: key="%S" modifiers="%S" WinConflict=Key event not available on some keyboard layouts: key="%S" modifiers="%S"
RecursiveBinding=The XBL binding "%S" is already used by an ancestor element TooDeepBindingRecursion=The XBL binding "%S" is already used by too many ancestor elements; not applying it to prevent infinite recursion.
CircularExtendsBinding=Extending the XBL binding "%S" with "%S" would lead to it extending itself CircularExtendsBinding=Extending the XBL binding "%S" with "%S" would lead to it extending itself
# LOCALIZATION NOTE: do not localize <handler command="..."> # LOCALIZATION NOTE: do not localize <handler command="...">
CommandNotInChrome=Use of <handler command="..."> not allowed outside chrome. CommandNotInChrome=Use of <handler command="..."> not allowed outside chrome.