Changeset 206990 in webkit

Timestamp:

Oct 10, 2016 1:19:03 AM (8 years ago)

Author:

Antti Koivisto

Message:

Enable optimized stylesheet updates in shadow trees
​https://bugs.webkit.org/show_bug.cgi?id=163180

Reviewed by Darin Adler.

Source/WebCore:

When we get a new stylesheet (for example when load completes) we invalidate only
those elements in DOM that are affected by the new sheet. This patch makes the
optimization also work in shadow trees.

Test: fast/shadow-dom/scoped-style-invalidation.html

• css/StyleInvalidationAnalysis.cpp:

(WebCore::StyleInvalidationAnalysis::invalidateStyle):

• css/StyleInvalidationAnalysis.h:
• dom/Document.cpp:

(WebCore::Document::didRemoveAllPendingStylesheet):

• style/StyleScope.cpp:

(WebCore::Style::Scope::removePendingSheet):
(WebCore::Style::Scope::analyzeStyleSheetChange):
(WebCore::Style::Scope::updateActiveStyleSheets):

LayoutTests:

• fast/shadow-dom/scoped-style-invalidation-expected.txt: Added.
• fast/shadow-dom/scoped-style-invalidation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/scoped-style-invalidation-expected.txt (added)
• LayoutTests/fast/shadow-dom/scoped-style-invalidation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleInvalidationAnalysis.cpp (modified) (1 diff)
• Source/WebCore/css/StyleInvalidationAnalysis.h (modified) (2 diffs)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-09  Antti Koivisto  <antti@apple.com>
+
+        Enable optimized stylesheet updates in shadow trees
+        https://bugs.webkit.org/show_bug.cgi?id=163180
+
+        Reviewed by Darin Adler.
+
+        * fast/shadow-dom/scoped-style-invalidation-expected.txt: Added.
+        * fast/shadow-dom/scoped-style-invalidation.html: Added.
+
 2016-10-09  Gyuyoung Kim  <gyuyoung.kim@navercorp.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-09  Antti Koivisto  <antti@apple.com>
+
+        Enable optimized stylesheet updates in shadow trees
+        https://bugs.webkit.org/show_bug.cgi?id=163180
+
+        Reviewed by Darin Adler.
+
+        When we get a new stylesheet (for example when load completes) we invalidate only
+        those elements in DOM that are affected by the new sheet. This patch makes the
+        optimization also work in shadow trees.
+
+        Test: fast/shadow-dom/scoped-style-invalidation.html
+
+        * css/StyleInvalidationAnalysis.cpp:
+        (WebCore::StyleInvalidationAnalysis::invalidateStyle):
+        * css/StyleInvalidationAnalysis.h:
+        * dom/Document.cpp:
+        (WebCore::Document::didRemoveAllPendingStylesheet):
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::removePendingSheet):
+        (WebCore::Style::Scope::analyzeStyleSheetChange):
+        (WebCore::Style::Scope::updateActiveStyleSheets):
+
 2016-10-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp

@@ -170 +170 @@
 }
 
+void StyleInvalidationAnalysis::invalidateStyle(ShadowRoot& shadowRoot)
+{
+    ASSERT(!m_dirtiesAllStyle);
+
+    for (auto& child : childrenOfType<Element>(shadowRoot)) {
+        SelectorFilter filter;
+        invalidateStyleForTree(child, &filter);
+    }
+}
+
 void StyleInvalidationAnalysis::invalidateStyle(Element& element)
 {

trunk/Source/WebCore/css/StyleInvalidationAnalysis.h

@@ -36 +36 @@
 class RuleSet;
 class SelectorFilter;
+class ShadowRoot;
 class StyleSheetContents;
 
@@ -46 +47 @@
     bool hasShadowPseudoElementRulesInAuthorSheet() const { return m_hasShadowPseudoElementRulesInAuthorSheet; }
     void invalidateStyle(Document&);
+    void invalidateStyle(ShadowRoot&);
     void invalidateStyle(Element&);
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3084 +3084 @@
     m_needsNotifyRemoveAllPendingStylesheet = false;
 
-    styleScope().didChangeCandidatesForActiveSet();
-
     if (m_pendingSheetLayout == DidLayoutWithPendingSheets) {
         m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;

trunk/Source/WebCore/style/StyleScope.cpp

@@ -130 +130 @@
     }
 
-    if (m_shadowRoot) {
-        // FIXME: Make optimized updates work.
-        didChangeContentsOrInterpretation();
-        return;
-    }
-
-    m_document.didRemoveAllPendingStylesheet();
+    didChangeCandidatesForActiveSet();
+
+    if (!m_shadowRoot)
+        m_document.didRemoveAllPendingStylesheet();
 }
 
@@ -301 +298 @@
     if (invalidationAnalysis.dirtiesAllStyle())
         return styleResolverUpdateType;
-    invalidationAnalysis.invalidateStyle(m_document);
+
+    if (m_shadowRoot)
+        invalidationAnalysis.invalidateStyle(*m_shadowRoot);
+    else
+        invalidationAnalysis.invalidateStyle(m_document);
+
     requiresFullStyleRecalc = false;
 
@@ -347 +349 @@
         return;
     }
-
-    // FIXME: Support optimized invalidation in shadow trees.
-    if (m_shadowRoot)
-        updateType = UpdateType::ContentsOrInterpretation;
 
     m_didUpdateActiveStyleSheets = true;