mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 14:55:47 +00:00
fixes nsIAtom leaks, bug # 25761, r=waterson
This commit is contained in:
parent
644b47bdf5
commit
b5072ce22c
@ -1282,7 +1282,6 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
|
||||
nsIAtom* childList = nsnull;
|
||||
PRInt32 childChange;
|
||||
nsIFrame* child;
|
||||
nsIAtom* frameType = nsnull;
|
||||
|
||||
do {
|
||||
child = nsnull;
|
||||
@ -1292,7 +1291,8 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
|
||||
child->GetFrameState(&state);
|
||||
if (NS_FRAME_OUT_OF_FLOW != (state & NS_FRAME_OUT_OF_FLOW)) {
|
||||
// only do frames that are in flow
|
||||
child->GetFrameType(&frameType);
|
||||
nsCOMPtr<nsIAtom> frameType;
|
||||
child->GetFrameType(getter_AddRefs(frameType));
|
||||
if (nsLayoutAtoms::placeholderFrame == frameType) { // placeholder
|
||||
// get out of flow frame and recurse there
|
||||
nsIFrame* outOfFlowFrame = ((nsPlaceholderFrame*)child)->GetOutOfFlowFrame();
|
||||
|
@ -1282,7 +1282,6 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
|
||||
nsIAtom* childList = nsnull;
|
||||
PRInt32 childChange;
|
||||
nsIFrame* child;
|
||||
nsIAtom* frameType = nsnull;
|
||||
|
||||
do {
|
||||
child = nsnull;
|
||||
@ -1292,7 +1291,8 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
|
||||
child->GetFrameState(&state);
|
||||
if (NS_FRAME_OUT_OF_FLOW != (state & NS_FRAME_OUT_OF_FLOW)) {
|
||||
// only do frames that are in flow
|
||||
child->GetFrameType(&frameType);
|
||||
nsCOMPtr<nsIAtom> frameType;
|
||||
child->GetFrameType(getter_AddRefs(frameType));
|
||||
if (nsLayoutAtoms::placeholderFrame == frameType) { // placeholder
|
||||
// get out of flow frame and recurse there
|
||||
nsIFrame* outOfFlowFrame = ((nsPlaceholderFrame*)child)->GetOutOfFlowFrame();
|
||||
|
Loading…
Reference in New Issue
Block a user