Changeset 185756 in webkit

Timestamp:

Jun 19, 2015, 11:18:05 AM (11 years ago)

Author:

Alan Bujtas

Message:

RenderRubyText requires RenderRubyRun parent.
​https://bugs.webkit.org/show_bug.cgi?id=146148
rdar://problem/21423319

Reviewed by Simon Fraser.

RenderRubyText expects its parent to be RenderRubyRun and since a
a non-block <rt> requires anonymous wrapper, we should check whether
the display type is actually block.

Source/WebCore:

Test: fast/ruby/crash-when-ruby-rt-is-non-block.html

• html/RubyTextElement.cpp:

(WebCore::RubyTextElement::createElementRenderer):

LayoutTests:

• fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt: Added.
• fast/ruby/crash-when-ruby-rt-is-non-block.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt (added)
• LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/RubyTextElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        RenderRubyText requires RenderRubyRun parent.
+        https://bugs.webkit.org/show_bug.cgi?id=146148
+        rdar://problem/21423319
+
+        Reviewed by Simon Fraser.
+
+        RenderRubyText expects its parent to be RenderRubyRun and since a
+        a non-block <rt> requires anonymous wrapper, we should check whether
+        the display type is actually block.
+
+        * fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt: Added.
+        * fast/ruby/crash-when-ruby-rt-is-non-block.html: Added.
+
 2015-06-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        RenderRubyText requires RenderRubyRun parent.
+        https://bugs.webkit.org/show_bug.cgi?id=146148
+        rdar://problem/21423319
+
+        Reviewed by Simon Fraser.
+
+        RenderRubyText expects its parent to be RenderRubyRun and since a
+        a non-block <rt> requires anonymous wrapper, we should check whether
+        the display type is actually block.
+
+        Test: fast/ruby/crash-when-ruby-rt-is-non-block.html
+
+        * html/RubyTextElement.cpp:
+        (WebCore::RubyTextElement::createElementRenderer):
+
 2015-06-19  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/html/RubyTextElement.cpp

@@ -49 +49 @@
 {
     // RenderRubyText requires its parent to be RenderRubyRun.
-    if (isRuby(insertionPosition.parent()))
+    if (isRuby(insertionPosition.parent()) && style.get().display() == BLOCK)
         return createRenderer<RenderRubyText>(*this, WTF::move(style));
     return HTMLElement::createElementRenderer(WTF::move(style), insertionPosition);