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

stop sharing contexts with parents

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@48548 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com
1999-09-21 07:50:16 +00:00
parent f0c345d6d5
commit 7deae09f51
3 changed files with 27 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/content/base/src/nsStyleSet.cpp
View File

@@ -461,35 +461,20 @@ nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext,
nsIStyleContext* result = nsnull;
aUsedRules = PR_FALSE;
if ((PR_FALSE == aForceUnique) &&
(nsnull != aParentContext) && (nsnull == aRules) &&
(0 == aParentContext->GetStyleRuleCount())) {
nsIAtom* parentTag = nsnull;
aParentContext->GetPseudoType(parentTag);
if (parentTag == aPseudoTag) {
// this and parent are empty, and compatible
result = aParentContext;
NS_ADDREF(result); // add ref for the caller
}
NS_IF_RELEASE(parentTag);
//fprintf(stdout, ".");
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
}
//fprintf(stdout, "+");
}
else {
}
else {
//fprintf(stdout, "-");
}
}
return result;
}

33
mozilla/layout/base/src/nsStyleSet.cpp
View File

@@ -461,35 +461,20 @@ nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext,
nsIStyleContext* result = nsnull;
aUsedRules = PR_FALSE;
if ((PR_FALSE == aForceUnique) &&
(nsnull != aParentContext) && (nsnull == aRules) &&
(0 == aParentContext->GetStyleRuleCount())) {
nsIAtom* parentTag = nsnull;
aParentContext->GetPseudoType(parentTag);
if (parentTag == aPseudoTag) {
// this and parent are empty, and compatible
result = aParentContext;
NS_ADDREF(result); // add ref for the caller
}
NS_IF_RELEASE(parentTag);
//fprintf(stdout, ".");
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
}
//fprintf(stdout, "+");
}
else {
}
else {
//fprintf(stdout, "-");
}
}
return result;
}

33
mozilla/layout/style/nsStyleSet.cpp
View File

@@ -461,35 +461,20 @@ nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext,
nsIStyleContext* result = nsnull;
aUsedRules = PR_FALSE;
if ((PR_FALSE == aForceUnique) &&
(nsnull != aParentContext) && (nsnull == aRules) &&
(0 == aParentContext->GetStyleRuleCount())) {
nsIAtom* parentTag = nsnull;
aParentContext->GetPseudoType(parentTag);
if (parentTag == aPseudoTag) {
// this and parent are empty, and compatible
result = aParentContext;
NS_ADDREF(result); // add ref for the caller
}
NS_IF_RELEASE(parentTag);
//fprintf(stdout, ".");
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if ((PR_FALSE == aForceUnique) && (nsnull != aParentContext)) {
aParentContext->FindChildWithRules(aPseudoTag, aRules, result);
}
if (nsnull == result) {
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
if (NS_OK == NS_NewStyleContext(&result, aParentContext, aPseudoTag, aRules, aPresContext)) {
if (PR_TRUE == aForceUnique) {
result->ForceUnique();
}
aUsedRules = PRBool(nsnull != aRules);
}
//fprintf(stdout, "+");
}
else {
}
else {
//fprintf(stdout, "-");
}
}
return result;
}