Compute the linkMatchType inside the CSSSelectorParser.

Source/core/css/CSSSelector.h

 /*
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *               1999 Waldo Bastian (bastian@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 278 matching lines @@
         }
 
         bool isLastInSelectorList() const { return m_isLastInSelectorList; }
         void setLastInSelectorList() { m_isLastInSelectorList = true; }
         bool isLastInTagHistory() const { return m_isLastInTagHistory; }
         void setNotLastInTagHistory() { m_isLastInTagHistory = false; }
 
         // http://dev.w3.org/csswg/selectors4/#compound
         bool isCompound() const;
 
+        // Note: the link match type is only valid for the start of each selector
+        // in a CSSSelectorList.
         enum LinkMatchMask { MatchLink = 1, MatchVisited = 2, MatchAll = MatchLink | MatchVisited };
-        unsigned computeLinkMatchType() const;
+        void updateLinkMatchType();
+        unsigned linkMatchType() const { return m_linkMatchType; }
 
         bool isForPage() const { return m_isForPage; }
         void setForPage() { m_isForPage = true; }
 
         bool relationIsAffectedByPseudoContent() const { return m_relationIsAffectedByPseudoContent; }
         void setRelationIsAffectedByPseudoContent() { m_relationIsAffectedByPseudoContent = true; }
 
     private:
-        unsigned m_relation           : 3; // enum Relation
-        mutable unsigned m_match      : 4; // enum Match
-        mutable unsigned m_pseudoType : 8; // PseudoType
+        unsigned m_relation               : 3; // enum Relation
+        unsigned m_match                  : 4; // enum Match
+        unsigned m_pseudoType             : 8; // PseudoType
         unsigned m_isLastInSelectorList   : 1;
         unsigned m_isLastInTagHistory     : 1;
         unsigned m_hasRareData            : 1;
         unsigned m_isForPage              : 1;
         unsigned m_tagIsImplicit          : 1;
         unsigned m_relationIsAffectedByPseudoContent  : 1;
+        unsigned m_linkMatchType          : 2; // LinkMatchMask
 
         void setPseudoType(PseudoType pseudoType)
         {
             m_pseudoType = pseudoType;
             ASSERT(static_cast<PseudoType>(m_pseudoType) == pseudoType); // using a bitfield.
         }
 
         unsigned specificityForOneSelector() const;
         unsigned specificityForPage() const;
 
@@ skipping 82 matching lines @@
 inline CSSSelector::CSSSelector()
     : m_relation(SubSelector)
     , m_match(Unknown)
     , m_pseudoType(PseudoUnknown)
     , m_isLastInSelectorList(false)
     , m_isLastInTagHistory(true)
     , m_hasRareData(false)
     , m_isForPage(false)
     , m_tagIsImplicit(false)
     , m_relationIsAffectedByPseudoContent(false)
+    , m_linkMatchType(MatchAll)
 {
 }
 
 inline CSSSelector::CSSSelector(const QualifiedName& tagQName, bool tagIsImplicit)
     : m_relation(SubSelector)
     , m_match(Tag)
     , m_pseudoType(PseudoUnknown)
     , m_isLastInSelectorList(false)
     , m_isLastInTagHistory(true)
     , m_hasRareData(false)
     , m_isForPage(false)
     , m_tagIsImplicit(tagIsImplicit)
     , m_relationIsAffectedByPseudoContent(false)
+    , m_linkMatchType(MatchAll)
 {
     m_data.m_tagQName = tagQName.impl();
     m_data.m_tagQName->ref();
 }
 
 inline CSSSelector::CSSSelector(const CSSSelector& o)
     : m_relation(o.m_relation)
     , m_match(o.m_match)
     , m_pseudoType(o.m_pseudoType)
     , m_isLastInSelectorList(o.m_isLastInSelectorList)
     , m_isLastInTagHistory(o.m_isLastInTagHistory)
     , m_hasRareData(o.m_hasRareData)
     , m_isForPage(o.m_isForPage)
     , m_tagIsImplicit(o.m_tagIsImplicit)
     , m_relationIsAffectedByPseudoContent(o.m_relationIsAffectedByPseudoContent)
+    , m_linkMatchType(MatchAll)
 {
     if (o.m_match == Tag) {
         m_data.m_tagQName = o.m_data.m_tagQName;
         m_data.m_tagQName->ref();
     } else if (o.m_hasRareData) {
         m_data.m_rareData = o.m_data.m_rareData;
         m_data.m_rareData->ref();
     } else if (o.m_data.m_value) {
         m_data.m_value = o.m_data.m_value;
         m_data.m_value->ref();
@@ skipping 22 matching lines @@
     if (m_hasRareData)
         return m_data.m_rareData->m_value;
     // AtomicString is really just a StringImpl* so the cast below is safe.
     // FIXME: Perhaps call sites could be changed to accept StringImpl?
     return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
 }
 
 } // namespace blink
 
 #endif // CSSSelector_h