Changeset 140331 in webkit

Timestamp:

Jan 21, 2013 6:57:19 AM (11 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [REGRESSION] Forced :visited pseudoclass has no effect on A elements
​https://bugs.webkit.org/show_bug.cgi?id=107448

Reviewed by Antti Koivisto.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::sortAndTransferMatchedRules): Remove totally bad code.
(WebCore::StyleResolver::styleForElement):

Use InsideVisitedLink if PseudoVisited has been forced by Inspector.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-21  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [REGRESSION] Forced :visited pseudoclass has no effect on A elements
+        https://bugs.webkit.org/show_bug.cgi?id=107448
+
+        Reviewed by Antti Koivisto.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::sortAndTransferMatchedRules): Remove totally bad code.
+        (WebCore::StyleResolver::styleForElement):
+          Use InsideVisitedLink if PseudoVisited has been forced by Inspector.
+
 2013-01-18  Andrey Adaikin  <aandrey@chromium.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -723 +723 @@
 
     // Now transfer the set of matched rules over to our list of declarations.
-    // FIXME: This sucks, the inspector should get the style from the visited style itself.
-    bool swapVisitedUnvisited = InspectorInstrumentation::forcePseudoState(m_element, CSSSelector::PseudoVisited);
     for (unsigned i = 0; i < m_matchedRules.size(); i++) {
         if (m_style && m_matchedRules[i]->containsUncommonAttributeSelector())
             m_style->setUnique();
-        unsigned linkMatchType = m_matchedRules[i]->linkMatchType();
-        if (swapVisitedUnvisited && linkMatchType && linkMatchType != SelectorChecker::MatchAll)
-            linkMatchType = (linkMatchType == SelectorChecker::MatchVisited) ? SelectorChecker::MatchLink : SelectorChecker::MatchVisited;
-        addMatchedProperties(result, m_matchedRules[i]->rule()->properties(), m_matchedRules[i]->rule(), linkMatchType, m_matchedRules[i]->propertyWhitelistType());
+        addMatchedProperties(result, m_matchedRules[i]->rule()->properties(), m_matchedRules[i]->rule(), m_matchedRules[i]->linkMatchType(), m_matchedRules[i]->propertyWhitelistType());
     }
 }
@@ -1589 +1584 @@
     if (element->isLink()) {
         m_style->setIsLink(true);
-        m_style->setInsideLink(m_elementLinkState);
+        EInsideLink linkState = m_elementLinkState;
+        if (m_elementLinkState != NotInsideLink) {
+            bool forceVisited = InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoVisited);
+            if (forceVisited)
+                linkState = InsideVisitedLink;
+        }
+
+        m_style->setInsideLink(linkState);
     }