Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-08 14:03:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
waterson%netscape.com 1999-02-01 23:06:49 +00:00
parent d2e3f54b83
commit 0b542b62ed
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
if (aTag == nsnull) if (aTag == nsnull)
return NS_OK; return NS_OK;
nsXULAtoms::AddrefAtoms();
PRInt32 nameSpaceID; PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) && if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) { nameSpaceID == nsXULAtoms::nameSpaceID) {
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
// Add the table frame to the flow // Add the table frame to the flow
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeitem) else if (aTag == nsXULAtoms::treeitem)
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems, aFixedItems); aFrameItems, aFixedItems);
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treechildren) else if (aTag == nsXULAtoms::treechildren)
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
} }
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treerow) else if (aTag == nsXULAtoms::treerow)
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext, rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents); aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeindentation) else if (aTag == nsXULAtoms::treeindentation)
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems.AddChild(placeholderFrame); aFrameItems.AddChild(placeholderFrame);
} }
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }

7
layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
if (aTag == nsnull) if (aTag == nsnull)
return NS_OK; return NS_OK;
nsXULAtoms::AddrefAtoms();
PRInt32 nameSpaceID; PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) && if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) { nameSpaceID == nsXULAtoms::nameSpaceID) {
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
// Add the table frame to the flow // Add the table frame to the flow
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeitem) else if (aTag == nsXULAtoms::treeitem)
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems, aFixedItems); aFrameItems, aFixedItems);
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treechildren) else if (aTag == nsXULAtoms::treechildren)
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
} }
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treerow) else if (aTag == nsXULAtoms::treerow)
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext, rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents); aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeindentation) else if (aTag == nsXULAtoms::treeindentation)
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems.AddChild(placeholderFrame); aFrameItems.AddChild(placeholderFrame);
} }
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }

7
layout/style/nsHTMLStyleSheet.cpp
View File

@ -2680,6 +2680,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
if (aTag == nsnull) if (aTag == nsnull)
return NS_OK; return NS_OK;
nsXULAtoms::AddrefAtoms();
PRInt32 nameSpaceID; PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) && if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) { nameSpaceID == nsXULAtoms::nameSpaceID) {
@ -2732,6 +2733,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
// Add the table frame to the flow // Add the table frame to the flow
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeitem) else if (aTag == nsXULAtoms::treeitem)
@ -2745,6 +2747,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems, aFixedItems); aFrameItems, aFixedItems);
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treechildren) else if (aTag == nsXULAtoms::treechildren)
@ -2779,6 +2782,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
} }
// No more work to do. // No more work to do.
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treerow) else if (aTag == nsXULAtoms::treerow)
@ -2801,6 +2805,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext, rv = ConstructTreeCellFrame(aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, aNewFrame, aFixedItems, allowEvents); aAbsoluteItems, aNewFrame, aFixedItems, allowEvents);
aFrameItems.AddChild(aNewFrame); aFrameItems.AddChild(aNewFrame);
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }
else if (aTag == nsXULAtoms::treeindentation) else if (aTag == nsXULAtoms::treeindentation)
@ -2859,7 +2864,7 @@ HTMLStyleSheetImpl::ConstructXULFrame(nsIPresContext* aPresContext,
aFrameItems.AddChild(placeholderFrame); aFrameItems.AddChild(placeholderFrame);
} }
} }
nsXULAtoms::ReleaseAtoms();
return rv; return rv;
} }