backing out changes made against a red tree
git-svn-id: svn://10.0.0.236/trunk@17628 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
672d296303
commit
cd62100e23
@ -1618,8 +1618,6 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
|
||||
// Ignore the tag if it's not HTML content
|
||||
if (NS_SUCCEEDED(aContent->QueryInterface(kIHTMLContentIID, (void **)&htmlContent))) {
|
||||
NS_RELEASE(htmlContent);
|
||||
|
||||
// See if the element is absolutely positioned
|
||||
const nsStylePosition* position = (const nsStylePosition*)
|
||||
aStyleContext->GetStyleData(eStyleStruct_Position);
|
||||
@ -1696,6 +1694,7 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
rv = NS_NewLabelFrame(aNewFrame);
|
||||
processChildren = PR_TRUE;
|
||||
}
|
||||
NS_RELEASE(htmlContent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1170,7 +1170,6 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
|
||||
NS_IF_RELEASE(pseudoTag);
|
||||
|
||||
if (!isPlaceholder) {
|
||||
NS_IF_RELEASE(frameContent);
|
||||
return aFrame;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1170,7 +1170,6 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
|
||||
NS_IF_RELEASE(pseudoTag);
|
||||
|
||||
if (!isPlaceholder) {
|
||||
NS_IF_RELEASE(frameContent);
|
||||
return aFrame;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1618,8 +1618,6 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
|
||||
// Ignore the tag if it's not HTML content
|
||||
if (NS_SUCCEEDED(aContent->QueryInterface(kIHTMLContentIID, (void **)&htmlContent))) {
|
||||
NS_RELEASE(htmlContent);
|
||||
|
||||
// See if the element is absolutely positioned
|
||||
const nsStylePosition* position = (const nsStylePosition*)
|
||||
aStyleContext->GetStyleData(eStyleStruct_Position);
|
||||
@ -1696,6 +1694,7 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
rv = NS_NewLabelFrame(aNewFrame);
|
||||
processChildren = PR_TRUE;
|
||||
}
|
||||
NS_RELEASE(htmlContent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1618,8 +1618,6 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
|
||||
// Ignore the tag if it's not HTML content
|
||||
if (NS_SUCCEEDED(aContent->QueryInterface(kIHTMLContentIID, (void **)&htmlContent))) {
|
||||
NS_RELEASE(htmlContent);
|
||||
|
||||
// See if the element is absolutely positioned
|
||||
const nsStylePosition* position = (const nsStylePosition*)
|
||||
aStyleContext->GetStyleData(eStyleStruct_Position);
|
||||
@ -1696,6 +1694,7 @@ HTMLStyleSheetImpl::ConstructFrameByTag(nsIPresContext* aPresContext,
|
||||
rv = NS_NewLabelFrame(aNewFrame);
|
||||
processChildren = PR_TRUE;
|
||||
}
|
||||
NS_RELEASE(htmlContent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user