mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 04:45:45 +00:00
Properly initialize out parameters to prevent the frame constructor from thinking it has to handle insertion points when it really doesn't. r=bryner sr=hyatt b=106802
This commit is contained in:
parent
9ba9c5c25b
commit
d925a84d2e
@ -1133,12 +1133,15 @@ nsBindingManager::GetInsertionPoint(nsIContent* aParent, nsIContent* aChild, nsI
|
||||
{
|
||||
nsCOMPtr<nsIXBLBinding> binding;
|
||||
GetBinding(aParent, getter_AddRefs(binding));
|
||||
|
||||
if (!binding) {
|
||||
*aResult = nsnull;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIContent> defContent;
|
||||
if (binding)
|
||||
return binding->GetInsertionPoint(aChild, aResult, aIndex, getter_AddRefs(defContent));
|
||||
|
||||
return NS_OK;
|
||||
return binding->GetInsertionPoint(aChild, aResult, aIndex,
|
||||
getter_AddRefs(defContent));
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@ -1148,12 +1151,16 @@ nsBindingManager::GetSingleInsertionPoint(nsIContent* aParent, nsIContent** aRes
|
||||
nsCOMPtr<nsIXBLBinding> binding;
|
||||
GetBinding(aParent, getter_AddRefs(binding));
|
||||
|
||||
nsCOMPtr<nsIContent> defContent;
|
||||
if (!binding) {
|
||||
*aMultipleInsertionPoints = PR_FALSE;
|
||||
*aResult = nsnull;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (binding)
|
||||
return binding->GetSingleInsertionPoint(aResult, aIndex, aMultipleInsertionPoints, getter_AddRefs(defContent));
|
||||
|
||||
return NS_OK;
|
||||
nsCOMPtr<nsIContent> defContent;
|
||||
return binding->GetSingleInsertionPoint(aResult, aIndex,
|
||||
aMultipleInsertionPoints,
|
||||
getter_AddRefs(defContent));
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
Loading…
Reference in New Issue
Block a user