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

Fix for bug #12997

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@45661 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-09-02 05:21:39 +00:00
parent c29e82e553
commit 88786eefbb
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5057,7 +5057,7 @@ nsCSSFrameConstructor::GetFloaterContainingBlock(nsIPresContext* aPresContext,
// for the specified content object. Returns PR_TRUE if the frame is associated
// with generated content and PR_FALSE otherwise
static inline PRBool
IsGeneratedContentFor(nsIContent* aContent, nsIFrame* aFrame)
IsGeneratedContentFor(nsIContent* aContent, nsIFrame* aFrame, nsIAtom* aPseudoElement)
{
NS_PRECONDITION(aFrame, "null frame pointer");
nsFrameState state;
@@ -5070,7 +5070,17 @@ IsGeneratedContentFor(nsIContent* aContent, nsIFrame* aFrame)
// Check that it has the same content pointer
aFrame->GetContent(&content);
result = (content == aContent);
if (content == aContent) {
nsIStyleContext* styleContext;
nsIAtom* pseudoType;
// See if the pseudo element type matches
aFrame->GetStyleContext(&styleContext);
styleContext->GetPseudoType(pseudoType);
result = (pseudoType == aPseudoElement);
NS_RELEASE(styleContext);
NS_IF_RELEASE(pseudoType);
}
NS_IF_RELEASE(content);
}
@@ -5094,7 +5104,7 @@ nsCSSFrameConstructor::AppendFrames(nsIPresContext* aPresContext,
nsIFrame* lastChild = frames.LastChild();
// See if the parent has an :after pseudo-element
if (lastChild && IsGeneratedContentFor(aContainer, lastChild)) {
if (lastChild && IsGeneratedContentFor(aContainer, lastChild, nsCSSAtoms::afterPseudo)) {
// Insert the frames before the :after pseudo-element
return aFrameManager->InsertFrames(*aPresContext, *aPresShell, aParentFrame,
nsnull, frames.GetPrevSiblingFor(lastChild),
@@ -5812,7 +5822,7 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
nsIFrame* firstChild;
parentFrame->FirstChild(nsnull, &firstChild);
if (firstChild && IsGeneratedContentFor(aContainer, firstChild)) {
if (firstChild && IsGeneratedContentFor(aContainer, firstChild, nsCSSAtoms::beforePseudo)) {
// Insert the new frames after the :before pseudo-element
prevSibling = firstChild;
}