зеркало из https://github.com/mozilla/pjs.git
Fix for 62301. r=hewitt, sr=ben
This commit is contained in:
Родитель
8069d1d82e
Коммит
90528a03a3
|
@ -1158,6 +1158,8 @@ nsXULElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
|
||||||
// We've faulted: create another heavyweight, and then copy
|
// We've faulted: create another heavyweight, and then copy
|
||||||
// stuff by hand.
|
// stuff by hand.
|
||||||
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
||||||
|
result->SetDocument(mDocument, PR_TRUE, PR_TRUE);
|
||||||
|
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
// Copy namespace stuff.
|
// Copy namespace stuff.
|
||||||
|
|
|
@ -7517,6 +7517,9 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||||
nsFrameItems& aFrameItems,
|
nsFrameItems& aFrameItems,
|
||||||
PRBool aXBLBaseTag)
|
PRBool aXBLBaseTag)
|
||||||
{
|
{
|
||||||
|
if (aTag == nsXULAtoms::menulist) {
|
||||||
|
printf("moo!");
|
||||||
|
}
|
||||||
// The following code allows the user to specify the base tag
|
// The following code allows the user to specify the base tag
|
||||||
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
||||||
// can then be extended arbitrarily.
|
// can then be extended arbitrarily.
|
||||||
|
@ -8291,6 +8294,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// We found it. Get the primary frame.
|
||||||
|
@ -8698,6 +8704,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// We found it. Get the primary frame.
|
||||||
|
@ -9398,6 +9407,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// We found it. Get the primary frame.
|
||||||
|
|
|
@ -7517,6 +7517,9 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||||
nsFrameItems& aFrameItems,
|
nsFrameItems& aFrameItems,
|
||||||
PRBool aXBLBaseTag)
|
PRBool aXBLBaseTag)
|
||||||
{
|
{
|
||||||
|
if (aTag == nsXULAtoms::menulist) {
|
||||||
|
printf("moo!");
|
||||||
|
}
|
||||||
// The following code allows the user to specify the base tag
|
// The following code allows the user to specify the base tag
|
||||||
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
|
||||||
// can then be extended arbitrarily.
|
// can then be extended arbitrarily.
|
||||||
|
@ -8291,6 +8294,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// We found it. Get the primary frame.
|
||||||
|
@ -8698,6 +8704,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// We found it. Get the primary frame.
|
||||||
|
@ -9398,6 +9407,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
|
||||||
temp->GetParent(*getter_AddRefs(content));
|
temp->GetParent(*getter_AddRefs(content));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!content)
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
nsIFrame* outerFrame = GetFrameFor(shell, aPresContext, content);
|
||||||
if (outerFrame) {
|
if (outerFrame) {
|
||||||
// We found it. Get the primary frame.
|
// 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
|
// We've faulted: create another heavyweight, and then copy
|
||||||
// stuff by hand.
|
// stuff by hand.
|
||||||
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
rv = nsXULElement::Create(mSlots->mNodeInfo, getter_AddRefs(result));
|
||||||
|
result->SetDocument(mDocument, PR_TRUE, PR_TRUE);
|
||||||
|
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
// Copy namespace stuff.
|
// Copy namespace stuff.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче