Changeset 83922 in webkit

Timestamp:

Apr 14, 2011 6:05:48 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-04-14 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Ojan Vafai.

Presence of shadow DOM should suppress rendering of ordinary child nodes
​https://bugs.webkit.org/show_bug.cgi?id=58073

• fast/dom/shadow/no-renderers-for-light-children-expected.txt: Added.
• fast/dom/shadow/no-renderers-for-light-children.html: Added.

2011-04-14 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Ojan Vafai.

Presence of shadow DOM should suppress rendering of ordinary child nodes
​https://bugs.webkit.org/show_bug.cgi?id=58073

Test: fast/dom/shadow/no-renderers-for-light-children.html

• dom/Node.cpp: (WebCore::shadowRoot): Added a helper function. (WebCore::Node::setDocumentRecursively): Changed to use the helper. (WebCore::shouldCreateRendererFor): Expanded a long condition check into a helper function,

added a check for children of an element with a shadow DOM.

(WebCore::Node::createRendererAndStyle): Changed to use the helper.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow (added)
• LayoutTests/fast/dom/shadow/no-renderers-for-light-children-expected.txt (added)
• LayoutTests/fast/dom/shadow/no-renderers-for-light-children.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-14  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Presence of shadow DOM should suppress rendering of ordinary child nodes
+        https://bugs.webkit.org/show_bug.cgi?id=58073
+
+        * fast/dom/shadow/no-renderers-for-light-children-expected.txt: Added.
+        * fast/dom/shadow/no-renderers-for-light-children.html: Added.
+
 2011-04-14  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Presence of shadow DOM should suppress rendering of ordinary child nodes
+        https://bugs.webkit.org/show_bug.cgi?id=58073
+
+        Test: fast/dom/shadow/no-renderers-for-light-children.html
+
+        * dom/Node.cpp:
+        (WebCore::shadowRoot): Added a helper function.
+        (WebCore::Node::setDocumentRecursively): Changed to use the helper.
+        (WebCore::shouldCreateRendererFor): Expanded a long condition check into a helper function,
+            added a check for children of an element with a shadow DOM.
+        (WebCore::Node::createRendererAndStyle): Changed to use the helper.
+
 2011-04-14  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -853 +853 @@
 }
 
+inline static ContainerNode* shadowRoot(Node* node)
+{
+    return node->isElementNode() ? toElement(node)->shadowRoot() : 0;
+}
+
 void Node::setDocumentRecursively(Document* newDocument)
 {
@@ -861 +866 @@
         if (!node->isElementNode())
             continue;
-        if (Node* shadow = toElement(node)->shadowRoot())
+        if (Node* shadow = shadowRoot(node))
             shadow->setDocumentRecursively(newDocument);
     }
@@ -1453 +1458 @@
 }
 
+static bool shouldCreateRendererFor(Node* node, ContainerNode* parentForRenderingAndStyle)
+{
+    RenderObject* parentRenderer = parentForRenderingAndStyle->renderer();
+    if (!parentRenderer)
+        return false;
+
+    bool atShadowBoundary = node->parentOrHostNode()->isShadowBoundary();
+
+    // FIXME: Ignoring canHaveChildren() in a case of isShadowRoot() might be wrong.
+    // See https://bugs.webkit.org/show_bug.cgi?id=52423
+    if (!parentRenderer->canHaveChildren() && !(node->isShadowRoot() || atShadowBoundary))
+        return false;
+
+    if (shadowRoot(parentForRenderingAndStyle) && !atShadowBoundary)
+        return false;
+
+    if (!parentForRenderingAndStyle->childShouldCreateRenderer(node))
+        return false;
+
+    return true;
+}
+
 RenderObject* Node::createRendererAndStyle()
 {
@@ -1461 +1488 @@
     ASSERT(parent);
 
-    RenderObject* parentRenderer = parent->renderer();
-
-    // FIXME: Ignoring canHaveChildren() in a case of isShadowRoot() might be wrong.
-    // See https://bugs.webkit.org/show_bug.cgi?id=52423
-    if (!parentRenderer || (!parentRenderer->canHaveChildren() && !(isShadowRoot() || parentNode()->isShadowBoundary())) || !parent->childShouldCreateRenderer(this))
+    if (!shouldCreateRendererFor(this, parent))
         return 0;
 
@@ -1476 +1499 @@
         return 0;
 
-    if (!parentRenderer->isChildAllowed(newRenderer, style.get())) {
+    if (!parent->renderer()->isChildAllowed(newRenderer, style.get())) {
         newRenderer->destroy();
         return 0;