Changeset 190256 in webkit

Timestamp:

Sep 25, 2015 3:06:09 PM (9 years ago)

Author:

Antti Koivisto

Message:

Implement scoped styling for shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=149230

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak.html

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::collectMatchingRules):

Only use special path here for user agent shadow trees.

• dom/AuthorStyleSheets.cpp:

(WebCore::AuthorStyleSheets::AuthorStyleSheets):
(WebCore::AuthorStyleSheets::removePendingSheet):
(WebCore::AuthorStyleSheets::updateActiveStyleSheets):

Basic support for ShadowRoot scoped stylesheets.

• dom/AuthorStyleSheets.h:

(WebCore::AuthorStyleSheets::activeStyleSheets):

• dom/InlineStyleSheetOwner.cpp:

(WebCore::InlineStyleSheetOwner::~InlineStyleSheetOwner):
(WebCore::authorStyleSheetsForElement):
(WebCore::InlineStyleSheetOwner::insertedIntoDocument):
(WebCore::InlineStyleSheetOwner::removedFromDocument):
(WebCore::InlineStyleSheetOwner::clearDocumentData):
(WebCore::InlineStyleSheetOwner::childrenChanged):
(WebCore::InlineStyleSheetOwner::createSheet):
(WebCore::InlineStyleSheetOwner::isLoading):
(WebCore::InlineStyleSheetOwner::sheetLoaded):
(WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):

Basic support for ShadowRoot scoped inline stylesheets.

• dom/InlineStyleSheetOwner.h:

(WebCore::InlineStyleSheetOwner::sheet):

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::styleResolver):

Create and initialize ShadowRoot scoped style resolver.

(WebCore::ShadowRoot::resetStyleResolver):
(WebCore::ShadowRoot::authorStyleSheets):

Collection of author stylesheets in the shadow tree.

(WebCore::ShadowRoot::updateStyle):

Trigger style recalc when stylesheets change.

(WebCore::ShadowRoot::cloneNode):

• dom/ShadowRoot.h:

(WebCore::ShadowRoot::resetStyleInheritance):

• html/HTMLStyleElement.h:
• svg/SVGStyleElement.h:

LayoutTests:

• fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak-expected.html: Added.
• fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak.html: Added.

Add a test that verifies that shadow DOM style doesn't affect normal DOM.

• platform/mac/TestExpectations:

Enable fast/shadow-dom/css-scoping-shadow-with-rules.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak-expected.html (added)
• LayoutTests/fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/ElementRuleCollector.cpp (modified) (2 diffs)
• Source/WebCore/dom/AuthorStyleSheets.cpp (modified) (4 diffs)
• Source/WebCore/dom/AuthorStyleSheets.h (modified) (3 diffs)
• Source/WebCore/dom/InlineStyleSheetOwner.cpp (modified) (7 diffs)
• Source/WebCore/dom/InlineStyleSheetOwner.h (modified) (1 diff)
• Source/WebCore/dom/ShadowRoot.cpp (modified) (3 diffs)
• Source/WebCore/dom/ShadowRoot.h (modified) (3 diffs)
• Source/WebCore/html/HTMLStyleElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGStyleElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-09-25  Antti Koivisto  <antti@apple.com>
+
+        Implement scoped styling for shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=149230
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak-expected.html: Added.
+        * fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak.html: Added.
+
+            Add a test that verifies that shadow DOM style doesn't affect normal DOM.
+
+        * platform/mac/TestExpectations:
+
+            Enable fast/shadow-dom/css-scoping-shadow-with-rules.html
+
 2015-09-25  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1309 +1309 @@
 
 webkit.org/b/148695 fast/shadow-dom [ Pass ]
-
-webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-with-rules.html [ ImageOnlyFailure ]
 webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-host-rule.html [ ImageOnlyFailure ]
 webkit.org/b/149328 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-25  Antti Koivisto  <antti@apple.com>
+
+        Implement scoped styling for shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=149230
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/shadow-dom/css-scoping-shadow-with-rules-no-style-leak.html
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::collectMatchingRules):
+
+            Only use special path here for user agent shadow trees.
+
+        * dom/AuthorStyleSheets.cpp:
+        (WebCore::AuthorStyleSheets::AuthorStyleSheets):
+        (WebCore::AuthorStyleSheets::removePendingSheet):
+        (WebCore::AuthorStyleSheets::updateActiveStyleSheets):
+
+            Basic support for ShadowRoot scoped stylesheets.
+
+        * dom/AuthorStyleSheets.h:
+        (WebCore::AuthorStyleSheets::activeStyleSheets):
+        * dom/InlineStyleSheetOwner.cpp:
+        (WebCore::InlineStyleSheetOwner::~InlineStyleSheetOwner):
+        (WebCore::authorStyleSheetsForElement):
+        (WebCore::InlineStyleSheetOwner::insertedIntoDocument):
+        (WebCore::InlineStyleSheetOwner::removedFromDocument):
+        (WebCore::InlineStyleSheetOwner::clearDocumentData):
+        (WebCore::InlineStyleSheetOwner::childrenChanged):
+        (WebCore::InlineStyleSheetOwner::createSheet):
+        (WebCore::InlineStyleSheetOwner::isLoading):
+        (WebCore::InlineStyleSheetOwner::sheetLoaded):
+        (WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):
+
+            Basic support for ShadowRoot scoped inline stylesheets.
+
+        * dom/InlineStyleSheetOwner.h:
+        (WebCore::InlineStyleSheetOwner::sheet):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::styleResolver):
+
+            Create and initialize ShadowRoot scoped style resolver.
+
+        (WebCore::ShadowRoot::resetStyleResolver):
+        (WebCore::ShadowRoot::authorStyleSheets):
+
+            Collection of author stylesheets in the shadow tree.
+
+        (WebCore::ShadowRoot::updateStyle):
+
+            Trigger style recalc when stylesheets change.
+
+        (WebCore::ShadowRoot::cloneNode):
+        * dom/ShadowRoot.h:
+        (WebCore::ShadowRoot::resetStyleInheritance):
+        * html/HTMLStyleElement.h:
+        * svg/SVGStyleElement.h:
+
 2015-09-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -41 +41 @@
 #include "SVGElement.h"
 #include "SelectorCompiler.h"
+#include "ShadowRoot.h"
 #include "StyleProperties.h"
 #include "StyledElement.h"
@@ -153 +154 @@
 #endif
 
-    if (m_element.isInShadowTree()) {
+    auto* shadowRoot = m_element.containingShadowRoot();
+    if (shadowRoot && shadowRoot->type() == ShadowRoot::Type::UserAgent) {
         const AtomicString& pseudoId = m_element.shadowPseudoId();
         if (!pseudoId.isEmpty())

trunk/Source/WebCore/dom/AuthorStyleSheets.cpp

@@ -42 +42 @@
 #include "SVGStyleElement.h"
 #include "Settings.h"
+#include "ShadowRoot.h"
 #include "StyleInvalidationAnalysis.h"
 #include "StyleResolver.h"
@@ -55 +56 @@
 using namespace HTMLNames;
 
-AuthorStyleSheets::AuthorStyleSheets(TreeScope& treeScope)
-    : m_document(treeScope.documentScope())
+AuthorStyleSheets::AuthorStyleSheets(Document& document)
+    : m_document(document)
+{
+}
+
+AuthorStyleSheets::AuthorStyleSheets(ShadowRoot& shadowRoot)
+    : m_document(shadowRoot.documentScope())
+    , m_shadowRoot(&shadowRoot)
 {
 }
@@ -80 +87 @@
         return;
     }
-    
+
+    if (m_shadowRoot) {
+        m_shadowRoot->updateStyle();
+        return;
+    }
+
     m_document.didRemoveAllPendingStylesheet();
 }
@@ -300 +312 @@
     analyzeStyleSheetChange(updateFlag, activeCSSStyleSheets, styleResolverUpdateType, requiresFullStyleRecalc);
 
-    if (styleResolverUpdateType == Reconstruct)
-        m_document.clearStyleResolver();
-    else {
+    if (styleResolverUpdateType == Reconstruct) {
+        if (m_shadowRoot)
+            m_shadowRoot->resetStyleResolver();
+        else
+            m_document.clearStyleResolver();
+    } else {
         StyleResolver& styleResolver = m_document.ensureStyleResolver();
         if (styleResolverUpdateType == Reset) {

trunk/Source/WebCore/dom/AuthorStyleSheets.h

@@ -46 +46 @@
 class StyleSheetContents;
 class StyleSheetList;
+class ShadowRoot;
 class TreeScope;
 
@@ -51 +52 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit AuthorStyleSheets(TreeScope&);
+    explicit AuthorStyleSheets(Document&);
+    explicit AuthorStyleSheets(ShadowRoot&);
 
     const Vector<RefPtr<CSSStyleSheet>>& activeStyleSheets() const { return m_activeStyleSheets; }
@@ -108 +110 @@
 
     Document& m_document;
+    ShadowRoot* m_shadowRoot { nullptr };
 
     Vector<RefPtr<StyleSheet>> m_styleSheetsForStyleSheetList;

trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

@@ -28 +28 @@
 #include "MediaQueryEvaluator.h"
 #include "ScriptableDocumentParser.h"
+#include "ShadowRoot.h"
 #include "StyleSheetContents.h"
 #include "TextNodeTraversal.h"
@@ -47 +48 @@
 }
 
-void InlineStyleSheetOwner::insertedIntoDocument(Document& document, Element& element)
+static AuthorStyleSheets& authorStyleSheetsForElement(Element& element)
 {
-    document.authorStyleSheets().addStyleSheetCandidateNode(element, m_isParsingChildren);
+    auto* shadowRoot = element.containingShadowRoot();
+    return shadowRoot ? shadowRoot->authorStyleSheets() : element.document().authorStyleSheets();
+}
+
+void InlineStyleSheetOwner::insertedIntoDocument(Document&, Element& element)
+{
+    authorStyleSheetsForElement(element).addStyleSheetCandidateNode(element, m_isParsingChildren);
 
     if (m_isParsingChildren)
@@ -58 +65 @@
 void InlineStyleSheetOwner::removedFromDocument(Document& document, Element& element)
 {
-    document.authorStyleSheets().removeStyleSheetCandidateNode(element);
+    authorStyleSheetsForElement(element).removeStyleSheetCandidateNode(element);
 
     if (m_sheet)
@@ -68 +75 @@
 }
 
-void InlineStyleSheetOwner::clearDocumentData(Document& document, Element& element)
+void InlineStyleSheetOwner::clearDocumentData(Document&, Element& element)
 {
     if (m_sheet)
@@ -75 +82 @@
     if (!element.inDocument())
         return;
-    document.authorStyleSheets().removeStyleSheetCandidateNode(element);
+    authorStyleSheetsForElement(element).removeStyleSheetCandidateNode(element);
 }
 
@@ -139 +146 @@
         return;
 
-    document.authorStyleSheets().addPendingSheet();
+    authorStyleSheetsForElement(element).addPendingSheet();
 
     m_loading = true;
@@ -161 +168 @@
 }
 
-bool InlineStyleSheetOwner::sheetLoaded(Document& document)
+bool InlineStyleSheetOwner::sheetLoaded(Element& element)
 {
     if (isLoading())
         return false;
 
-    document.authorStyleSheets().removePendingSheet();
+    authorStyleSheetsForElement(element).removePendingSheet();
     return true;
 }
 
-void InlineStyleSheetOwner::startLoadingDynamicSheet(Document& document)
+void InlineStyleSheetOwner::startLoadingDynamicSheet(Element& element)
 {
-    document.authorStyleSheets().addPendingSheet();
+    authorStyleSheetsForElement(element).addPendingSheet();
 }
 

trunk/Source/WebCore/dom/InlineStyleSheetOwner.h

@@ -42 +42 @@
 
     bool isLoading() const;
-    bool sheetLoaded(Document&);
-    void startLoadingDynamicSheet(Document&);
+    bool sheetLoaded(Element&);
+    void startLoadingDynamicSheet(Element&);
 
     void insertedIntoDocument(Document&, Element&);

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -28 +28 @@
 #include "ShadowRoot.h"
 
+#include "AuthorStyleSheets.h"
+#include "CSSStyleSheet.h"
 #include "ElementTraversal.h"
 #include "InsertionPoint.h"
@@ -41 +43 @@
     unsigned countersAndFlags[1];
     void* styleResolver;
+    void* authorStyleSheets;
     void* host;
 #if ENABLE(SHADOW_DOM)
@@ -74 +77 @@
 StyleResolver& ShadowRoot::styleResolver()
 {
-    if (m_styleResolver)
-        return *m_styleResolver;
-
-    return document().ensureStyleResolver();
+    // FIXME: Use isolated style resolver for user agent shadow roots.
+    if (m_type == Type::UserAgent)
+        return document().ensureStyleResolver();
+
+    if (!m_styleResolver) {
+        // FIXME: We could share style resolver with shadow roots that have identical style.
+        m_styleResolver = std::make_unique<StyleResolver>(document(), true);
+        if (m_authorStyleSheets)
+            m_styleResolver->appendAuthorStyleSheets(0, m_authorStyleSheets->activeStyleSheets());
+    }
+    return *m_styleResolver;
+}
+
+void ShadowRoot::resetStyleResolver()
+{
+    m_styleResolver = nullptr;
+}
+
+AuthorStyleSheets& ShadowRoot::authorStyleSheets()
+{
+    if (!m_authorStyleSheets)
+        m_authorStyleSheets = std::make_unique<AuthorStyleSheets>(*this);
+    return *m_authorStyleSheets;
+}
+
+void ShadowRoot::updateStyle()
+{
+    bool shouldRecalcStyle = false;
+
+    if (m_authorStyleSheets) {
+        // FIXME: Make optimized updated work.
+        shouldRecalcStyle = m_authorStyleSheets->updateActiveStyleSheets(AuthorStyleSheets::FullUpdate);
+    }
+
+    if (shouldRecalcStyle)
+        setNeedsStyleRecalc();
 }
 

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -37 +37 @@
 namespace WebCore {
 
+class AuthorStyleSheets;
 class ContentDistributor;
 class HTMLSlotElement;
@@ -57 +58 @@
 
     StyleResolver& styleResolver();
+    AuthorStyleSheets& authorStyleSheets();
+    
+    void updateStyle();
+    void resetStyleResolver();
 
     bool resetStyleInheritance() const { return m_resetStyleInheritance; }
@@ -103 +108 @@
     Type m_type;
 
+    Element* m_host;
+
     std::unique_ptr<StyleResolver> m_styleResolver;
-
-    Element* m_host;
+    std::unique_ptr<AuthorStyleSheets> m_authorStyleSheets;
 
 #if ENABLE(SHADOW_DOM)

trunk/Source/WebCore/html/HTMLStyleElement.h

@@ -60 +60 @@
 
     bool isLoading() const { return m_styleSheetOwner.isLoading(); }
-    virtual bool sheetLoaded() override { return m_styleSheetOwner.sheetLoaded(document()); }
+    virtual bool sheetLoaded() override { return m_styleSheetOwner.sheetLoaded(*this); }
     virtual void notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred) override;
-    virtual void startLoadingDynamicSheet() override { m_styleSheetOwner.startLoadingDynamicSheet(document()); }
+    virtual void startLoadingDynamicSheet() override { m_styleSheetOwner.startLoadingDynamicSheet(*this); }
 
     virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;

trunk/Source/WebCore/svg/SVGStyleElement.h

@@ -60 +60 @@
 
     virtual bool isLoading() const { return m_styleSheetOwner.isLoading(); }
-    virtual bool sheetLoaded() override { return m_styleSheetOwner.sheetLoaded(document()); }
-    virtual void startLoadingDynamicSheet() override { m_styleSheetOwner.startLoadingDynamicSheet(document()); }
+    virtual bool sheetLoaded() override { return m_styleSheetOwner.sheetLoaded(*this); }
+    virtual void startLoadingDynamicSheet() override { m_styleSheetOwner.startLoadingDynamicSheet(*this); }
     virtual Timer* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }