зеркало из https://github.com/mozilla/pjs.git
Force an nsXULAtoms::AddrefAtoms to ensure that the XUL atoms and namespace are created in the layout DLL before trying to refer to them. (a=hyatt%netscape.com)
This commit is contained in:
waterson%netscape.com
Родитель
40617d2099
Коммит
c5340bff6b
|
|
@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
if (aTag == nsnull)
|
||||
return NS_OK;
|
||||
|
||||
nsXULAtoms::AddrefAtoms();
|
||||
PRInt32 nameSpaceID;
|
||||
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
|
||||
nameSpaceID == nsXULAtoms::nameSpaceID) {
|
||||
|
|
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
// Add the table frame to the flow
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
}
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeitem)
|
||||
|
|
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems, aFixedItems);
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treechildren)
|
||||
|
|
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
}
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treerow)
|
||||
|
|
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
|
||||
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeindentation)
|
||||
|
|
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems.AddChild(placeholderFrame);
|
||||
}
|
||||
}
|
||||
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
if (aTag == nsnull)
|
||||
return NS_OK;
|
||||
|
||||
nsXULAtoms::AddrefAtoms();
|
||||
PRInt32 nameSpaceID;
|
||||
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
|
||||
nameSpaceID == nsXULAtoms::nameSpaceID) {
|
||||
|
|
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
// Add the table frame to the flow
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
}
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeitem)
|
||||
|
|
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems, aFixedItems);
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treechildren)
|
||||
|
|
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
}
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treerow)
|
||||
|
|
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
|
||||
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeindentation)
|
||||
|
|
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems.AddChild(placeholderFrame);
|
||||
}
|
||||
}
|
||||
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
if (aTag == nsnull)
|
||||
return NS_OK;
|
||||
|
||||
nsXULAtoms::AddrefAtoms();
|
||||
PRInt32 nameSpaceID;
|
||||
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
|
||||
nameSpaceID == nsXULAtoms::nameSpaceID) {
|
||||
|
|
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
// Add the table frame to the flow
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
}
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeitem)
|
||||
|
|
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems, aFixedItems);
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treechildren)
|
||||
|
|
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
}
|
||||
|
||||
// No more work to do.
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treerow)
|
||||
|
|
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
|
||||
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
|
||||
aFrameItems.AddChild(aNewFrame);
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
else if (aTag == nsXULAtoms::treeindentation)
|
||||
|
|
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
|
|||
aFrameItems.AddChild(placeholderFrame);
|
||||
}
|
||||
}
|
||||
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче