diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index ad2bd5bd5d8e..ed2a467f0102 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -1119,7 +1119,6 @@ RuleProcessorData::RuleProcessorData(nsPresContext* aPresContext, mPresContext(aPresContext), mElement(aElement), mRuleWalker(aRuleWalker), - mScopedRoot(nsnull), mPreviousSiblingData(nsnull), mParentData(nsnull), mLanguage(nsnull), diff --git a/layout/style/nsRuleProcessorData.h b/layout/style/nsRuleProcessorData.h index 084fe3b720db..52f3721308a1 100644 --- a/layout/style/nsRuleProcessorData.h +++ b/layout/style/nsRuleProcessorData.h @@ -81,11 +81,16 @@ struct TreeMatchContext { // nsRuleWalker::VisitedHandlingType. nsRuleWalker::VisitedHandlingType mVisitedHandling; + // Root of scoped stylesheet (set and unset by the supplier of the + // scoped stylesheet). + nsIContent* mScopedRoot; + TreeMatchContext(PRBool aForStyling, nsRuleWalker::VisitedHandlingType aVisitedHandling) : mForStyling(aForStyling) , mHaveRelevantLink(PR_FALSE) , mVisitedHandling(aVisitedHandling) + , mScopedRoot(nsnull) { } }; @@ -174,7 +179,6 @@ public: mozilla::dom::Element* mElement; // weak ref, must not be null nsIContent* mParentContent; // mElement->GetParent(); weak ref nsRuleWalker* mRuleWalker; // Used to add rules to our results. - nsIContent* mScopedRoot; // Root of scoped stylesheet (set and unset by the supplier of the scoped stylesheet nsIAtom* mContentTag; // mElement->GetTag() nsIAtom* mContentID; // mElement->GetID()