Changeset 84517 in webkit

Timestamp:

Apr 21, 2011 10:37:47 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-04-20 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Kent Tamura.

REGRESSION (r75543): Styles bleed into new shadow DOM (like slider and video)
​https://bugs.webkit.org/show_bug.cgi?id=52917

• fast/css/shadow-dom-scope-expected.txt: Added.
• fast/css/shadow-dom-scope.html: Added.

2011-04-20 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Kent Tamura.

REGRESSION (r75543): Styles bleed into new shadow DOM (like slider and video)
​https://bugs.webkit.org/show_bug.cgi?id=52917

In order to determine whether a rule should apply inside of a shadow DOM subtree,
we collect three pieces of information:

1) Are we parsing UA sheets?
2) Does the current tree scope allows applying author sheets?
3) Does the rule explicitly reach into shadow DOM (using pseudo-elements, for example)?

If the answer to all of these is no, we ignore the rule.

Test: fast/css/shadow-dom-scope.html

• css/CSSStyleSelector.cpp: (WebCore::MatchingUARulesScope::MatchingUARulesScope): Added a scope helper to

track whether we are currently matching UA rules.

(WebCore::CSSStyleSelector::matchRulesForList): Added the check for three

conditions mentioned above.

(WebCore::CSSStyleSelector::SelectorChecker::SelectorChecker): Added

initializer for the flag, which helps us determine whether the rule
explicitly reaches into shadow DOM.

(WebCore::CSSStyleSelector::matchUARules): Started using the scope helper.
(WebCore::CSSStyleSelector::checkSelector): Added initializing of the

flag.

(WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector): Added setting

of the flag when we encounter unknown pseudo-elements.

• css/CSSStyleSelector.h: Adjusted decls.
• dom/ShadowRoot.cpp: (WebCore::ShadowRoot::applyAuthorSheets): Added.
• dom/ShadowRoot.h: Adjusted decls.
• dom/TreeScope.cpp: (WebCore::TreeScope::applyAuthorSheets): Added.
• dom/TreeScope.h: Adjusted decls.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/shadow-dom-scope-expected.txt (added)
• LayoutTests/fast/css/shadow-dom-scope.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (6 diffs)
• Source/WebCore/css/CSSStyleSelector.h (modified) (1 diff)
• Source/WebCore/dom/ShadowRoot.cpp (modified) (1 diff)
• Source/WebCore/dom/ShadowRoot.h (modified) (1 diff)
• Source/WebCore/dom/TreeScope.cpp (modified) (1 diff)
• Source/WebCore/dom/TreeScope.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-20  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        REGRESSION (r75543): Styles bleed into new shadow DOM (like slider and video)
+        https://bugs.webkit.org/show_bug.cgi?id=52917
+
+        * fast/css/shadow-dom-scope-expected.txt: Added.
+        * fast/css/shadow-dom-scope.html: Added.
+
 2011-04-21  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        REGRESSION (r75543): Styles bleed into new shadow DOM (like slider and video)
+        https://bugs.webkit.org/show_bug.cgi?id=52917
+
+        In order to determine whether a rule should apply inside of a shadow DOM subtree,
+        we collect three pieces of information:
+
+        1) Are we parsing UA sheets?
+        2) Does the current tree scope allows applying author sheets?
+        3) Does the rule explicitly reach into shadow DOM (using pseudo-elements, for example)?
+
+        If the answer to all of these is no, we ignore the rule.
+
+        Test: fast/css/shadow-dom-scope.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::MatchingUARulesScope::MatchingUARulesScope): Added a scope helper to
+            track whether we are currently matching UA rules.
+        (WebCore::CSSStyleSelector::matchRulesForList): Added the check for three
+            conditions mentioned above.
+        (WebCore::CSSStyleSelector::SelectorChecker::SelectorChecker): Added
+            initializer for the flag, which helps us determine whether the rule
+            explicitly reaches into shadow DOM.
+        (WebCore::CSSStyleSelector::matchUARules): Started using the scope helper.
+        (WebCore::CSSStyleSelector::checkSelector): Added initializing of the
+            flag.
+        (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector): Added setting
+            of the flag when we encounter unknown pseudo-elements.
+        * css/CSSStyleSelector.h: Adjusted decls.
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::applyAuthorSheets): Added.
+        * dom/ShadowRoot.h: Adjusted decls.
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::applyAuthorSheets): Added.
+        * dom/TreeScope.h: Adjusted decls.
+
 2011-04-21  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -747 +747 @@
 }
 
+class MatchingUARulesScope {
+public:
+    MatchingUARulesScope();
+    ~MatchingUARulesScope();
+
+    static bool isMatchingUARules();
+
+private:
+    static bool m_matchingUARules;
+};
+
+MatchingUARulesScope::MatchingUARulesScope()
+{
+    ASSERT(!m_matchingUARules);
+    m_matchingUARules = true;
+}
+
+MatchingUARulesScope::~MatchingUARulesScope()
+{
+    m_matchingUARules = false;
+}
+
+inline bool MatchingUARulesScope::isMatchingUARules()
+{
+    return m_matchingUARules;
+}
+
+bool MatchingUARulesScope::m_matchingUARules = false;
+
+inline static bool matchesInTreeScope(TreeScope* treeScope, bool ruleReachesIntoShadowDOM)
+{
+    return MatchingUARulesScope::isMatchingUARules() || treeScope->applyAuthorSheets() || ruleReachesIntoShadowDOM;
+}
+
 void CSSStyleSelector::matchRulesForList(const Vector<RuleData>* rules, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules)
 {
@@ -761 +795 @@
             continue;
         if (checkSelector(ruleData)) {
+            if (!matchesInTreeScope(m_element->treeScope(), m_checker.m_hasUnknownPseudoElements))
+                continue;
             // If the rule has no properties to apply, then ignore it in the non-debug mode.
             CSSStyleRule* rule = ruleData.rule();
@@ -882 +918 @@
     , m_pseudoStyle(NOPSEUDO)
     , m_documentIsHTML(document->isHTMLDocument())
+    , m_hasUnknownPseudoElements(false)
     , m_matchVisitedPseudoClass(false)
 {
@@ -1169 +1206 @@
 void CSSStyleSelector::matchUARules(int& firstUARule, int& lastUARule)
 {
+    MatchingUARulesScope scope;
+
     // First we match rules from the user agent sheet.
     RuleSet* userAgentStyleSheet = m_medium->mediaTypeMatchSpecific("print")
@@ -2042 +2081 @@
 {
     m_dynamicPseudo = NOPSEUDO;
+    m_checker.m_hasUnknownPseudoElements = false;
 
     // Let the slow path handle SVG as it has some additional rules regarding shadow trees.
@@ -2939 +2979 @@
         if (!elementStyle && !m_collectRulesOnly)
             return false;
+
+        if (sel->isUnknownPseudoElement())
+            m_hasUnknownPseudoElements = true;
 
         PseudoId pseudoId = CSSSelector::pseudoId(sel->pseudoType());

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -276 +276 @@
             PseudoId m_pseudoStyle;
             bool m_documentIsHTML;
+            mutable bool m_hasUnknownPseudoElements;
             mutable bool m_matchVisitedPseudoClass;
             mutable HashSet<LinkHash, LinkHashHash> m_linksCheckedForVisitedState;

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -122 +122 @@
 }
 
+bool ShadowRoot::applyAuthorSheets() const
+{
+    return false;
 }
+
+}

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -52 +52 @@
     virtual PassRefPtr<Node> cloneNode(bool deep);
     virtual bool childTypeAllowed(NodeType) const;
+    virtual bool applyAuthorSheets() const;
 
     ContainerNode* firstContentElement() const;

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -159 +159 @@
 }
 
+bool TreeScope::applyAuthorSheets() const
+{
+    return true;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -66 +66 @@
     Element* findAnchor(const String& name);
 
+    virtual bool applyAuthorSheets() const;
+
 protected:
     TreeScope(Document*);