Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 96455: hr has duplicate lineboxes in frame tree

Browse Source 
- Move code in HaveFirstLetter*() methods to a more generic method
    HasPseudoStyle() to expand it's use, and make those methods call it.

  - Added static method RemoveGeneratedContentFrameSiblings(), which
    is now called from ContentRemoved(), to remove any sibling :before
    and :after frames for a given frame.

r=attinasi@netscape.com (also looked at by rbs@maths.uq.edu.au)
sr=waterson@netscape.com


git-svn-id: svn://10.0.0.236/trunk@108105 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2001-11-14 23:55:44 +00:00
parent 2c2e9d314d
commit c853bf4c4b
2 changed files with 178 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@@ -9038,6 +9038,90 @@ nsCSSFrameConstructor::RemoveMappingsForFrameSubtree(nsIPresContext* aPresContex
return DeletingFrameSubtree(aPresContext, presShell, frameManager, aRemovedFrame);
}
static PRBool
HasPseudoStyle(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIStyleContext* aStyleContext,
nsIAtom* aPseudoElement)
{
nsCOMPtr<nsIStyleContext> pseudoStyleContext;
if (aContent) {
aPresContext->ProbePseudoStyleContextFor(aContent,
aPseudoElement,
aStyleContext, PR_FALSE,
getter_AddRefs(pseudoStyleContext));
}
return pseudoStyleContext != nsnull;
}
static void
RemoveGeneratedContentFrameSiblings(nsIPresContext *aPresContext, nsIPresShell *aPresShell, nsIFrameManager *aFrameManager, nsIFrame *aInsertionPoint, nsIFrame *aFrame)
{
NS_ASSERTION(aPresContext && aPresShell && aFrameManager && aFrame, "Null arg pointer!");
nsCOMPtr<nsIContent> content;
nsCOMPtr<nsIStyleContext> styleContext;
aFrame->GetContent(getter_AddRefs(content));
aFrame->GetStyleContext(getter_AddRefs(styleContext));
if (!content || !content->IsContentOfType(nsIContent::eELEMENT) || !styleContext)
return;
//
// Remove any :before generated content frame that precedes aFrame.
//
if (HasPseudoStyle(aPresContext, content, styleContext,
nsCSSAtoms::beforePseudo)) {
nsIFrame *beforeFrame = nsnull;
nsIFrame *frame = nsnull;
aFrame->GetParent(&frame);
// Find aFrame's previous sibling.
// XXX: Is there a better way to do this?
if (frame) {
nsIFrame *prev = nsnull;
frame->FirstChild(aPresContext, nsnull, &frame);
while (frame) {
if (frame == aFrame) {
beforeFrame = prev;
break;
}
prev = frame;
frame->GetNextSibling(&frame);
}
}
if (beforeFrame &&
IsGeneratedContentFor(content, beforeFrame, nsCSSAtoms::beforePseudo)) {
aFrameManager->RemoveFrame(aPresContext, *aPresShell,
aInsertionPoint, nsnull,
beforeFrame);
}
}
//
// Remove any :after generated content frame that follows aFrame.
//
if (HasPseudoStyle(aPresContext, content, styleContext,
nsCSSAtoms::afterPseudo)) {
nsIFrame *afterFrame = nsnull;
aFrame->GetNextSibling(&afterFrame);
if (afterFrame &&
IsGeneratedContentFor(content, afterFrame, nsCSSAtoms::afterPseudo)) {
aFrameManager->RemoveFrame(aPresContext, *aPresShell,
aInsertionPoint, nsnull,
afterFrame);
}
}
}
NS_IMETHODIMP
nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
nsIContent* aContainer,
@@ -9367,6 +9451,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
nsLayoutAtoms::captionList, childFrame);
}
else {
RemoveGeneratedContentFrameSiblings(aPresContext, shell, frameManager, insertionPoint, childFrame);
rv = frameManager->RemoveFrame(aPresContext, *shell, insertionPoint,
nsnull, childFrame);
}
@@ -11468,18 +11553,8 @@ nsCSSFrameConstructor::HaveFirstLetterStyle(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIStyleContext* aStyleContext)
{
nsCOMPtr<nsIStyleContext> fls;
if (aContent) {
aPresContext->ProbePseudoStyleContextFor(aContent,
nsHTMLAtoms::firstLetterPseudo,
aStyleContext, PR_FALSE,
getter_AddRefs(fls));
}
PRBool result = PR_FALSE;
if (fls) {
result = PR_TRUE;
}
return result;
return HasPseudoStyle(aPresContext, aContent, aStyleContext,
nsHTMLAtoms::firstLetterPseudo);
}
PRBool
@@ -11487,18 +11562,8 @@ nsCSSFrameConstructor::HaveFirstLineStyle(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIStyleContext* aStyleContext)
{
nsCOMPtr<nsIStyleContext> fls;
if (aContent) {
aPresContext->ProbePseudoStyleContextFor(aContent,
nsHTMLAtoms::firstLinePseudo,
aStyleContext, PR_FALSE,
getter_AddRefs(fls));
}
PRBool result = PR_FALSE;
if (fls) {
result = PR_TRUE;
}
return result;
return HasPseudoStyle(aPresContext, aContent, aStyleContext,
nsHTMLAtoms::firstLinePseudo);
}
void