From 65a76bc8a40c665bfb532635d60e1b07d1674e6f Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 8 Apr 2001 22:22:47 +0000
Subject: [PATCH] Fix regression to :-moz-bound-element caused by the :not
 checkin.

git-svn-id: svn://10.0.0.236/trunk@91706 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../html/style/src/nsCSSStyleSheet.cpp        | 28 +++++++++----------
 mozilla/layout/style/nsCSSStyleSheet.cpp      | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index d777b902d27..ecdb84a26a9 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -3023,6 +3023,20 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
           result = localTrue;
         }
       }
+      else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
+        if (!data.mStyleRuleSupplier) {
+          nsCOMPtr<nsIPresShell> shell;
+          data.mPresContext->GetShell(getter_AddRefs(shell));
+          nsCOMPtr<nsIStyleSet> styleSet;
+          shell->GetStyleSet(getter_AddRefs(styleSet));
+          styleSet->GetStyleRuleSupplier(getter_AddRefs(data.mStyleRuleSupplier));
+        }
+
+        if (data.mStyleRuleSupplier)
+          data.mStyleRuleSupplier->MatchesScopedRoot(data.mContent, &result);
+        else 
+          result = localFalse;
+      }
       else if (nsCSSAtoms::langPseudo == pseudoClass->mAtom) {
         // XXX not yet implemented
         result = localFalse;
@@ -3064,20 +3078,6 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
             }
           }
         }
-        else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
-          if (!data.mStyleRuleSupplier) {
-            nsCOMPtr<nsIPresShell> shell;
-            data.mPresContext->GetShell(getter_AddRefs(shell));
-            nsCOMPtr<nsIStyleSet> styleSet;
-            shell->GetStyleSet(getter_AddRefs(styleSet));
-            styleSet->GetStyleRuleSupplier(getter_AddRefs(data.mStyleRuleSupplier));
-          }
-
-          if (data.mStyleRuleSupplier)
-            data.mStyleRuleSupplier->MatchesScopedRoot(data.mContent, &result);
-          else 
-            result = localFalse;
-        }
         else {
           result = localFalse;  // not a link
         }
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index d777b902d27..ecdb84a26a9 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -3023,6 +3023,20 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
           result = localTrue;
         }
       }
+      else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
+        if (!data.mStyleRuleSupplier) {
+          nsCOMPtr<nsIPresShell> shell;
+          data.mPresContext->GetShell(getter_AddRefs(shell));
+          nsCOMPtr<nsIStyleSet> styleSet;
+          shell->GetStyleSet(getter_AddRefs(styleSet));
+          styleSet->GetStyleRuleSupplier(getter_AddRefs(data.mStyleRuleSupplier));
+        }
+
+        if (data.mStyleRuleSupplier)
+          data.mStyleRuleSupplier->MatchesScopedRoot(data.mContent, &result);
+        else 
+          result = localFalse;
+      }
       else if (nsCSSAtoms::langPseudo == pseudoClass->mAtom) {
         // XXX not yet implemented
         result = localFalse;
@@ -3064,20 +3078,6 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
             }
           }
         }
-        else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
-          if (!data.mStyleRuleSupplier) {
-            nsCOMPtr<nsIPresShell> shell;
-            data.mPresContext->GetShell(getter_AddRefs(shell));
-            nsCOMPtr<nsIStyleSet> styleSet;
-            shell->GetStyleSet(getter_AddRefs(styleSet));
-            styleSet->GetStyleRuleSupplier(getter_AddRefs(data.mStyleRuleSupplier));
-          }
-
-          if (data.mStyleRuleSupplier)
-            data.mStyleRuleSupplier->MatchesScopedRoot(data.mContent, &result);
-          else 
-            result = localFalse;
-        }
         else {
           result = localFalse;  // not a link
         }