Changeset 190006 in webkit

Timestamp:

Sep 18, 2015 7:31:01 PM (9 years ago)

Author:

Antti Koivisto

Message:

Don't create renderers for children of shadow host
​https://bugs.webkit.org/show_bug.cgi?id=149363

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/shadow-dom/css-scoping-shadow-root-hides-children.html

• dom/ShadowRoot.h:
• style/StyleResolveTree.cpp:

(WebCore::Style::attachRenderTree):
(WebCore::Style::resolveShadowTree):
(WebCore::Style::resolveChildren):
(WebCore::Style::resolveTree):

LayoutTests:

• fast/shadow-dom/css-scoping-shadow-root-hides-children-expected.html: Added.
• fast/shadow-dom/css-scoping-shadow-root-hides-children.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/css-scoping-shadow-root-hides-children-expected.html (added)
• LayoutTests/fast/shadow-dom/css-scoping-shadow-root-hides-children.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ShadowRoot.h (modified) (1 diff)
• Source/WebCore/style/StyleResolveTree.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-09-18  Antti Koivisto  <antti@apple.com>
+
+        Don't create renderers for children of shadow host
+        https://bugs.webkit.org/show_bug.cgi?id=149363
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/css-scoping-shadow-root-hides-children-expected.html: Added.
+        * fast/shadow-dom/css-scoping-shadow-root-hides-children.html: Added.
+
 2015-09-18  Jake Nielsen  <jacob_nielsen@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-18  Antti Koivisto  <antti@apple.com>
+
+        Don't create renderers for children of shadow host
+        https://bugs.webkit.org/show_bug.cgi?id=149363
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/shadow-dom/css-scoping-shadow-root-hides-children.html
+
+        * dom/ShadowRoot.h:
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::attachRenderTree):
+        (WebCore::Style::resolveShadowTree):
+        (WebCore::Style::resolveChildren):
+        (WebCore::Style::resolveTree):
+
 2015-09-08  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -99 +99 @@
     virtual Ref<Node> cloneNodeInternal(Document&, CloningOperation) override;
 
-    bool m_resetStyleInheritance : 1;
+    bool m_resetStyleInheritance;
     Type m_type;
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -492 +492 @@
         attachBeforeOrAfterPseudoElementIfNeeded(current, BEFORE, childRenderTreePosition);
 
-        if (ShadowRoot* shadowRoot = current.shadowRoot()) {
+        auto* shadowRoot = current.shadowRoot();
+        if (shadowRoot) {
             parentPusher.push();
             attachShadowRoot(*shadowRoot);
@@ -498 +499 @@
             parentPusher.push();
 
-        attachChildren(current, renderer->style(), childRenderTreePosition);
+        bool skipChildren = shadowRoot && shadowRoot->type() != ShadowRoot::Type::UserAgent;
+        if (!skipChildren)
+            attachChildren(current, renderer->style(), childRenderTreePosition);
 
         if (AXObjectCache* cache = current.document().axObjectCache())
@@ -677 +680 @@
 static void resolveShadowTree(ShadowRoot& shadowRoot, Element& host, Style::Change change)
 {
+    StyleResolverParentPusher parentPusher(&host);
+
     ASSERT(shadowRoot.host() == &host);
     ASSERT(host.renderer());
@@ -687 +692 @@
             continue;
         }
-        if (is<Element>(*child))
+        if (is<Element>(*child)) {
+            parentPusher.push();
             resolveTree(downcast<Element>(*child), host.renderer()->style(), renderTreePosition, change);
+        }
     }
 
@@ -763 +770 @@
 #endif // PLATFORM(IOS)
 
+static void resolveChildren(Element& current, RenderStyle& inheritedStyle, Change change, RenderTreePosition& childRenderTreePosition)
+{
+    StyleResolverParentPusher parentPusher(&current);
+
+    bool elementNeedingStyleRecalcAffectsNextSiblingElementStyle = false;
+    for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
+        if (RenderObject* childRenderer = child->renderer())
+            childRenderTreePosition.invalidateNextSibling(*childRenderer);
+        if (is<Text>(*child) && child->needsStyleRecalc()) {
+            resolveTextNode(downcast<Text>(*child), childRenderTreePosition);
+            continue;
+        }
+        if (!is<Element>(*child))
+            continue;
+
+        Element& childElement = downcast<Element>(*child);
+        if (elementNeedingStyleRecalcAffectsNextSiblingElementStyle) {
+            if (childElement.styleIsAffectedByPreviousSibling())
+                childElement.setNeedsStyleRecalc();
+            elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
+        } else if (childElement.needsStyleRecalc())
+            elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
+        if (change >= Inherit || childElement.childNeedsStyleRecalc() || childElement.needsStyleRecalc()) {
+            parentPusher.push();
+            resolveTree(childElement, inheritedStyle, childRenderTreePosition, change);
+        }
+    }
+}
+
 void resolveTree(Element& current, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Change change)
 {
@@ -791 +827 @@
 
     if (change != Detach && renderer) {
-        StyleResolverParentPusher parentPusher(&current);
-
-        if (ShadowRoot* shadowRoot = current.shadowRoot()) {
-            if (change >= Inherit || shadowRoot->childNeedsStyleRecalc() || shadowRoot->needsStyleRecalc()) {
-                parentPusher.push();
-                resolveShadowTree(*shadowRoot, current, change);
-            }
-        }
+        auto* shadowRoot = current.shadowRoot();
+        if (shadowRoot && (change >= Inherit || shadowRoot->childNeedsStyleRecalc() || shadowRoot->needsStyleRecalc()))
+            resolveShadowTree(*shadowRoot, current, change);
 
         RenderTreePosition childRenderTreePosition(*renderer);
         updateBeforeOrAfterPseudoElement(current, change, BEFORE, childRenderTreePosition);
 
-        bool elementNeedingStyleRecalcAffectsNextSiblingElementStyle = false;
-        for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
-            if (RenderObject* childRenderer = child->renderer())
-                childRenderTreePosition.invalidateNextSibling(*childRenderer);
-            if (is<Text>(*child) && child->needsStyleRecalc()) {
-                resolveTextNode(downcast<Text>(*child), childRenderTreePosition);
-                continue;
-            }
-            if (!is<Element>(*child))
-                continue;
-
-            Element& childElement = downcast<Element>(*child);
-            if (elementNeedingStyleRecalcAffectsNextSiblingElementStyle) {
-                if (childElement.styleIsAffectedByPreviousSibling())
-                    childElement.setNeedsStyleRecalc();
-                elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
-            } else if (childElement.needsStyleRecalc())
-                elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
-            if (change >= Inherit || childElement.childNeedsStyleRecalc() || childElement.needsStyleRecalc()) {
-                parentPusher.push();
-                resolveTree(childElement, renderer->style(), childRenderTreePosition, change);
-            }
-        }
+        bool skipChildren = shadowRoot && shadowRoot->type() != ShadowRoot::Type::UserAgent;
+        if (!skipChildren)
+            resolveChildren(current, renderer->style(), change, childRenderTreePosition);
 
         updateBeforeOrAfterPseudoElement(current, change, AFTER, childRenderTreePosition);