Bug 598832 part 3. Stop keeping track of whether the node or document is HTML in the RuleProcessorData. r=dbaron

layout/style/nsCSSRuleProcessor.cpp

@@ -1115,7 +1115,8 @@ RuleProcessorData::RuleProcessorData(nsPresContext* aPresContext,
   : TreeMatchContext(aForStyling,
                      aRuleWalker ?
                        aRuleWalker->VisitedHandling() :
-                       nsRuleWalker::eLinksVisitedOrUnvisited),
+                       nsRuleWalker::eLinksVisitedOrUnvisited,
+                     aElement->IsInHTMLDocument()),
     mPresContext(aPresContext),
     mElement(aElement),
     mRuleWalker(aRuleWalker),
@@ -1164,10 +1165,6 @@ RuleProcessorData::RuleProcessorData(nsPresContext* aPresContext,
   // get the namespace
   mNameSpaceID = aElement->GetNameSpaceID();
 
-  // check for HTMLContent status
-  mIsHTMLContent = (mNameSpaceID == kNameSpaceID_XHTML);
-  mIsHTML = mIsHTMLContent && aElement->IsInHTMLDocument();
-
   // No need to initialize mContentState; the ContentState() accessor will handle
   // that.
 }
@@ -1651,10 +1648,13 @@ static PRBool SelectorMatches(Element* aElement,
        data.mNameSpaceID != aSelector->mNameSpace))
     return PR_FALSE;
 
-  if (aSelector->mLowercaseTag && 
-      (data.mIsHTML ? aSelector->mLowercaseTag : aSelector->mCasedTag) !=
-        data.mContentTag) {
-    return PR_FALSE;
+  if (aSelector->mLowercaseTag) {
+    nsIAtom* selectorTag =
+      (aTreeMatchContext.mIsHTMLDocument && aElement->IsHTML()) ?
+        aSelector->mLowercaseTag : aSelector->mCasedTag;
+    if (selectorTag != data.mContentTag) {
+      return PR_FALSE;
+    }
   }
 
   nsAtomList* IDList = aSelector->mIDList;
@@ -1988,7 +1988,7 @@ static PRBool SelectorMatches(Element* aElement,
         break;
 
       case nsCSSPseudoClasses::ePseudoClass_mozIsHTML:
-        if (!data.mIsHTML) {
+        if (!aTreeMatchContext.mIsHTMLDocument || !aElement->IsHTML()) {
           return PR_FALSE;
         }
         break;
@@ -2056,7 +2056,7 @@ static PRBool SelectorMatches(Element* aElement,
 
       case nsCSSPseudoClasses::ePseudoClass_mozTableBorderNonzero:
         {
-          if (!data.mIsHTMLContent || data.mContentTag != nsGkAtoms::table) {
+          if (!aElement->IsHTML() || data.mContentTag != nsGkAtoms::table) {
             return PR_FALSE;
           }
           nsGenericElement *ge = static_cast<nsGenericElement*>(data.mElement);
@@ -2085,7 +2085,7 @@ static PRBool SelectorMatches(Element* aElement,
           // (unnegated)). This at least makes it closer to the spec.
           !isNegated &&
           // important for |IsQuirkEventSensitive|:
-          data.mIsHTMLContent && !data.IsLink() &&
+          aElement->IsHTML() && !data.IsLink() &&
           !IsQuirkEventSensitive(data.mContentTag)) {
         // In quirks mode, only make certain elements sensitive to
         // selectors ":hover" and ":active".
@@ -2118,7 +2118,9 @@ static PRBool SelectorMatches(Element* aElement,
       nsIAtom* matchAttribute;
 
       do {
-        matchAttribute = data.mIsHTML ? attr->mLowercaseAttr : attr->mCasedAttr;
+        PRBool isHTML =
+          (aTreeMatchContext.mIsHTMLDocument && aElement->IsHTML());
+        matchAttribute = isHTML ? attr->mLowercaseAttr : attr->mCasedAttr;
         if (attr->mNameSpace == kNameSpaceID_Unknown) {
           // Attr selector with a wildcard namespace.  We have to examine all
           // the attributes on our content node....  This sort of selector is
@@ -2146,7 +2148,7 @@ static PRBool SelectorMatches(Element* aElement,
                 data.mElement->GetAttr(attrName->NamespaceID(),
                                        attrName->LocalName(), value);
               NS_ASSERTION(hasAttr, "GetAttrNameAt lied");
-              result = AttrMatchesValue(attr, value, data.mIsHTML);
+              result = AttrMatchesValue(attr, value, isHTML);
             }
 
             // At this point |result| has been set by us
@@ -2163,8 +2165,8 @@ static PRBool SelectorMatches(Element* aElement,
           result =
             data.mElement->
               AttrValueIs(attr->mNameSpace, matchAttribute, attr->mValue,
-                          (!data.mIsHTML || attr->mCaseSensitive) ? eCaseMatters
-                                                                  : eIgnoreCase);
+                          (!isHTML || attr->mCaseSensitive) ? eCaseMatters
+                                                            : eIgnoreCase);
         }
         else if (!data.mElement->HasAttr(attr->mNameSpace, matchAttribute)) {
           result = PR_FALSE;
@@ -2176,7 +2178,7 @@ static PRBool SelectorMatches(Element* aElement,
 #endif
               data.mElement->GetAttr(attr->mNameSpace, matchAttribute, value);
           NS_ASSERTION(hasAttr, "HasAttr lied");
-          result = AttrMatchesValue(attr, value, data.mIsHTML);
+          result = AttrMatchesValue(attr, value, isHTML);
         }
         
         attr = attr->mNext;

layout/style/nsHTMLStyleSheet.cpp

@@ -215,7 +215,7 @@ static nsresult GetBodyColor(nsPresContext* aPresContext, nscolor* aColor)
 nsHTMLStyleSheet::RulesMatching(ElementRuleProcessorData* aData)
 {
   nsRuleWalker *ruleWalker = aData->mRuleWalker;
-  if (aData->mIsHTMLContent) {
+  if (aData->mElement->IsHTML()) {
     nsIAtom* tag = aData->mContentTag;
 
     // if we have anchor colors, check if this is an anchor with an href
@@ -273,7 +273,7 @@ nsHTMLStyleSheet::RulesMatching(ElementRuleProcessorData* aData)
 /* virtual */ nsRestyleHint
 nsHTMLStyleSheet::HasStateDependentStyle(StateRuleProcessorData* aData)
 {
-  if (aData->mIsHTMLContent &&
+  if (aData->mElement->IsHTML() &&
       aData->mContentTag == nsGkAtoms::a &&
       aData->IsLink() &&
       ((mActiveRule && aData->mStateMask.HasState(NS_EVENT_STATE_ACTIVE)) ||

layout/style/nsRuleProcessorData.h

@@ -85,12 +85,18 @@ struct TreeMatchContext {
   // scoped stylesheet).
   nsIContent* mScopedRoot;
 
+  // Whether our document is HTML (as opposed to XML of some sort,
+  // including XHTML).
+  const PRPackedBool mIsHTMLDocument;
+
   TreeMatchContext(PRBool aForStyling,
-                   nsRuleWalker::VisitedHandlingType aVisitedHandling)
+                   nsRuleWalker::VisitedHandlingType aVisitedHandling,
+                   PRBool aIsHTMLDocument)
     : mForStyling(aForStyling)
     , mHaveRelevantLink(PR_FALSE)
     , mVisitedHandling(aVisitedHandling)
     , mScopedRoot(nsnull)
+    , mIsHTMLDocument(aIsHTMLDocument)
   {
   }
 };
@@ -182,8 +188,6 @@ public:
   
   nsIAtom*          mContentTag;    // mElement->GetTag()
   nsIAtom*          mContentID;     // mElement->GetID()
-  PRPackedBool      mIsHTMLContent; // whether mElement is IsHTML()
-  PRPackedBool      mIsHTML;        // mIsHTMLContent && IsInHTMLDocument()
   PRPackedBool      mHasAttributes; // mElement->GetAttrCount() > 0
   nsCompatibility   mCompatMode;    // Possibly remove use of this in SelectorMatches?
   PRInt32           mNameSpaceID;   // mElement->GetNameSapce()