mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-26 06:38:36 +00:00
Fix for 62301. r=hewitt, sr=ben
This commit is contained in:
parent
a6be61eef1
commit
14719259ef
@ -1158,6 +1158,8 @@ nsXULElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
|
||||
// We've faulted: create another heavyweight, and then copy
|
||||
// stuff by hand.
|
||||
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
||||
result->SetDocument(mDocument, PR_TRUE, PR_TRUE);
|
||||
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Copy namespace stuff.
|
||||
|
@ -7517,6 +7517,9 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||
nsFrameItems& aFrameItems,
|
||||
PRBool aXBLBaseTag)
|
||||
{
|
||||
if (aTag == nsXULAtoms::menulist) {
|
||||
printf("moo!");
|
||||
}
|
||||
// The following code allows the user to specify the base tag
|
||||
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
||||
// can then be extended arbitrarily.
|
||||
@ -8291,6 +8294,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
@ -8698,6 +8704,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
@ -9398,6 +9407,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
|
@ -7517,6 +7517,9 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||
nsFrameItems& aFrameItems,
|
||||
PRBool aXBLBaseTag)
|
||||
{
|
||||
if (aTag == nsXULAtoms::menulist) {
|
||||
printf("moo!");
|
||||
}
|
||||
// The following code allows the user to specify the base tag
|
||||
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
||||
// can then be extended arbitrarily.
|
||||
@ -8291,6 +8294,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
@ -8698,6 +8704,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
@ -9398,6 +9407,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
|
||||
temp->GetParent(*getter_AddRefs(content));
|
||||
}
|
||||
|
||||
if (!content)
|
||||
return NS_OK;
|
||||
|
||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||
if (outerFrame) {
|
||||
// We found it. Get the primary frame.
|
||||
|
@ -1158,6 +1158,8 @@ nsXULElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
|
||||
// We've faulted: create another heavyweight, and then copy
|
||||
// stuff by hand.
|
||||
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
||||
result->SetDocument(mDocument, PR_TRUE, PR_TRUE);
|
||||
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Copy namespace stuff.
|
||||
|
Loading…
x
Reference in New Issue
Block a user