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 shell; + data.mPresContext->GetShell(getter_AddRefs(shell)); + nsCOMPtr 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 shell; - data.mPresContext->GetShell(getter_AddRefs(shell)); - nsCOMPtr 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 shell; + data.mPresContext->GetShell(getter_AddRefs(shell)); + nsCOMPtr 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 shell; - data.mPresContext->GetShell(getter_AddRefs(shell)); - nsCOMPtr 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 }