From 7deae09f5184dc94fb6bda723b01e05805634133 Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com"
 <peterl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Sep 1999 07:50:16 +0000
Subject: [PATCH] stop sharing contexts with parents

git-svn-id: svn://10.0.0.236/trunk@48548 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsStyleSet.cpp | 33 +++++++------------------
 mozilla/layout/base/src/nsStyleSet.cpp  | 33 +++++++------------------
 mozilla/layout/style/nsStyleSet.cpp     | 33 +++++++------------------
 3 files changed, 27 insertions(+), 72 deletions(-)

diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp
index 865f6b4e2ba..5b517412c9d 100644
--- a/mozilla/content/base/src/nsStyleSet.cpp
+++ b/mozilla/content/base/src/nsStyleSet.cpp
@@ -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;
 }
diff --git a/mozilla/layout/base/src/nsStyleSet.cpp b/mozilla/layout/base/src/nsStyleSet.cpp
index 865f6b4e2ba..5b517412c9d 100644
--- a/mozilla/layout/base/src/nsStyleSet.cpp
+++ b/mozilla/layout/base/src/nsStyleSet.cpp
@@ -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;
 }
diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp
index 865f6b4e2ba..5b517412c9d 100644
--- a/mozilla/layout/style/nsStyleSet.cpp
+++ b/mozilla/layout/style/nsStyleSet.cpp
@@ -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;
 }