Changeset 84759 in webkit

Timestamp:

Apr 24, 2011 2:20:42 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-24 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Dimitri Glazkov.

Crash when adding a text node to a shadow root
​https://bugs.webkit.org/show_bug.cgi?id=59304

• fast/dom/shadow/append-child-text-expected.txt: Added.
• fast/dom/shadow/append-child-text.html: Added.

2011-04-24 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Dimitri Glazkov.

Crash when adding a text node to a shadow root
​https://bugs.webkit.org/show_bug.cgi?id=59304

Text nodes need to consult their host element for style.

Test: fast/dom/shadow/append-child-text.html

• dom/Node.cpp: (WebCore::NodeRendererFactory::styleForRenderer): (WebCore::NodeRendererFactory::createRendererAndStyle): (WebCore::Node::styleForRenderer): forward to NodeRendererFactory

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/append-child-text-expected.txt (added)
• LayoutTests/fast/dom/shadow/append-child-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-24  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Crash when adding a text node to a shadow root
+        https://bugs.webkit.org/show_bug.cgi?id=59304
+
+        * fast/dom/shadow/append-child-text-expected.txt: Added.
+        * fast/dom/shadow/append-child-text.html: Added.
+
 2011-04-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-24  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Crash when adding a text node to a shadow root
+        https://bugs.webkit.org/show_bug.cgi?id=59304
+
+        Text nodes need to consult their host element for style.
+
+        Test: fast/dom/shadow/append-child-text.html
+
+        * dom/Node.cpp:
+        (WebCore::NodeRendererFactory::styleForRenderer):
+        (WebCore::NodeRendererFactory::createRendererAndStyle):
+        (WebCore::Node::styleForRenderer): forward to NodeRendererFactory
+
 2011-04-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -1484 +1484 @@
     ContainerNode* parentNodeForRenderingAndStyle() const { return m_parentNodeForRenderingAndStyle; }
     void createRendererIfNeeded();
+    PassRefPtr<RenderStyle> styleForRenderer();
 
 private:
@@ -1497 +1498 @@
     ShadowRoot* m_visualParentShadowRoot;
 };
+
+PassRefPtr<RenderStyle> NodeRendererFactory::styleForRenderer()
+{
+    if (m_node->isElementNode()) {
+        bool allowSharing = true;
+#if ENABLE(XHTMLMP)
+        // noscript needs the display property protected - it's a special case
+        allowSharing = m_node->localName() != HTMLNames::noscriptTag.localName();
+#endif
+        return m_node->document()->styleSelector()->styleForElement(static_cast<Element*>(m_node), 0, allowSharing);
+    }
+    ContainerNode* parentNodeForStyle = parentNodeForRenderingAndStyle();
+    return parentNodeForStyle && parentNodeForStyle->renderer() ? parentNodeForStyle->renderer()->style() : 0;
+}
 
 ContainerNode* NodeRendererFactory::findVisualParent()
@@ -1557 +1572 @@
         return 0;
 
-    RefPtr<RenderStyle> style = m_node->styleForRenderer();
+    RefPtr<RenderStyle> style = styleForRenderer();
     if (!m_node->rendererIsNeeded(style.get()))
         return 0;
@@ -1622 +1637 @@
 PassRefPtr<RenderStyle> Node::styleForRenderer()
 {
-    if (isElementNode()) {
-        bool allowSharing = true;
-#if ENABLE(XHTMLMP)
-        // noscript needs the display property protected - it's a special case
-        allowSharing = localName() != HTMLNames::noscriptTag.localName();
-#endif
-        return document()->styleSelector()->styleForElement(static_cast<Element*>(this), 0, allowSharing);
-    }
-    return parentNode() && parentNode()->renderer() ? parentNode()->renderer()->style() : 0;
+    return NodeRendererFactory(this).styleForRenderer();
 }