Changeset 146967 in webkit

Timestamp:

Mar 26, 2013 11:39:36 PM (11 years ago)

Author:

tasak@google.com

Message:

[shadow] styleForText should consider the case where parent node has no style
​https://bugs.webkit.org/show_bug.cgi?id=113275

Source/WebCore:

If a text node is distributed, its parent node for rendering and
styling might have no style. In the case, styleForText should return
default style.

Reviewed by Hajime Morrita.

Test: fast/dom/shadow/text-node-distributed-crash.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForText):
Check whether a parent node has any style or not. If not, return
default style. This is the same behavior as styleForElement.

LayoutTests:

Reviewed by Hajime Morrita.

• fast/dom/shadow/text-node-distributed-crash-expected.txt: Added.
• fast/dom/shadow/text-node-distributed-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/text-node-distributed-crash-expected.txt (added)
• LayoutTests/fast/dom/shadow/text-node-distributed-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-26  Takashi Sakamoto  <tasak@google.com>
+
+        [shadow] styleForText should consider the case where parent node has no style
+        https://bugs.webkit.org/show_bug.cgi?id=113275
+
+        Reviewed by Hajime Morrita.
+
+        * fast/dom/shadow/text-node-distributed-crash-expected.txt: Added.
+        * fast/dom/shadow/text-node-distributed-crash.html: Added.
+
 2013-03-26  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Takashi Sakamoto  <tasak@google.com>
+
+        [shadow] styleForText should consider the case where parent node has no style
+        https://bugs.webkit.org/show_bug.cgi?id=113275
+
+        If a text node is distributed, its parent node for rendering and
+        styling might have no style. In the case, styleForText should return
+        default style.
+
+        Reviewed by Hajime Morrita.
+
+        Test: fast/dom/shadow/text-node-distributed-crash.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForText):
+        Check whether a parent node has any style or not. If not, return
+        default style. This is the same behavior as styleForElement.
+
 2013-03-26  Takeshi Yoshino  <tyoshino@chromium.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1273 +1273 @@
     NodeRenderingContext context(textNode);
     Node* parentNode = context.parentNodeForRenderingAndStyle();
-    return context.resetStyleInheritance() || !parentNode ?
+    return context.resetStyleInheritance() || !parentNode || !parentNode->renderStyle() ?
         defaultStyleForElement() : parentNode->renderStyle();
 }