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

Fixes regression due to Style Data sharing: forcing shared contexts to be unique now when they have to be reresolved. b=63118 r=karnaze@netscape.com a=buster@netscape.com

Browse Source
This commit is contained in:
attinasi%netscape.com 2000-12-21 22:16:38 +00:00
parent a994aaaae3
commit 09cf5ac2fb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsFrameManager.cpp
View File

@ -1533,7 +1533,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
}
else {
NS_ASSERTION(localContent, "non pseudo-element frame without content node");
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_FALSE, &newContext);
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_TRUE, &newContext);
}
NS_ASSERTION(newContext, "failed to get new style context");
if (newContext) {
@ -1614,7 +1614,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
PR_FALSE, &undisplayedContext);
PR_TRUE, &undisplayedContext);
}
else { // pseudo element
NS_ASSERTION(pseudoTag, "pseudo element without tag");
@ -1745,7 +1745,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
}
else {
NS_ASSERTION(localContent, "non pseudo-element frame without content node");
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_FALSE, &newContext);
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_TRUE, &newContext);
}
NS_ASSERTION(newContext, "failed to get new style context");
if (newContext) {
@ -1826,7 +1826,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
PR_FALSE, &undisplayedContext);
PR_TRUE, &undisplayedContext);
}
else { // pseudo element
NS_ASSERTION(pseudoTag, "pseudo element without tag");

8
layout/html/base/src/nsFrameManager.cpp
View File

@ -1533,7 +1533,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
}
else {
NS_ASSERTION(localContent, "non pseudo-element frame without content node");
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_FALSE, &newContext);
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_TRUE, &newContext);
}
NS_ASSERTION(newContext, "failed to get new style context");
if (newContext) {
@ -1614,7 +1614,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
PR_FALSE, &undisplayedContext);
PR_TRUE, &undisplayedContext);
}
else { // pseudo element
NS_ASSERTION(pseudoTag, "pseudo element without tag");
@ -1745,7 +1745,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
}
else {
NS_ASSERTION(localContent, "non pseudo-element frame without content node");
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_FALSE, &newContext);
aPresContext->ResolveStyleContextFor(content, aParentContext, PR_TRUE, &newContext);
}
NS_ASSERTION(newContext, "failed to get new style context");
if (newContext) {
@ -1826,7 +1826,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
undisplayed->mStyle->GetPseudoType(pseudoTag);
if (undisplayed->mContent && pseudoTag == nsnull) { // child content
aPresContext->ResolveStyleContextFor(undisplayed->mContent, newContext,
PR_FALSE, &undisplayedContext);
PR_TRUE, &undisplayedContext);
}
else { // pseudo element
NS_ASSERTION(pseudoTag, "pseudo element without tag");