Changeset 66371 in webkit

Timestamp:

Aug 30, 2010 12:35:30 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-08-30 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

WebCore::RenderBlock::addChild* NULL ptrs
​https://bugs.webkit.org/show_bug.cgi?id=43722

• fast/ruby/before-doesnt-crash-expected.txt: Added.
• fast/ruby/before-doesnt-crash.html: Added.

2010-08-30 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

WebCore::RenderBlock::addChild* NULL ptrs
​https://bugs.webkit.org/show_bug.cgi?id=43722

Also includes some cleanup of comments and ASSERTs.

Test: fast/ruby/before-doesnt-crash.html

• rendering/RenderRuby.cpp: (WebCore::RenderRubyAsInline::addChild):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/ruby/before-doesnt-crash-expected.txt (added)
• LayoutTests/fast/ruby/before-doesnt-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderRuby.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-30  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebCore::RenderBlock::addChild* NULL ptrs
+        https://bugs.webkit.org/show_bug.cgi?id=43722
+
+        * fast/ruby/before-doesnt-crash-expected.txt: Added.
+        * fast/ruby/before-doesnt-crash.html: Added.
+
 2010-08-29  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-30  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebCore::RenderBlock::addChild* NULL ptrs
+        https://bugs.webkit.org/show_bug.cgi?id=43722
+
+        Also includes some cleanup of comments and ASSERTs.
+
+        Test: fast/ruby/before-doesnt-crash.html
+
+        * rendering/RenderRuby.cpp:
+        (WebCore::RenderRubyAsInline::addChild):
+
 2010-08-30  Marc-Antoine Ruel  <maruel@chromium.org>
 

trunk/WebCore/rendering/RenderRuby.cpp

@@ -76 +76 @@
 void RenderRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild)
 {
-    // Note: ':after' content is handled implicitely below
+    // Note: ':after' content is handled implicitly below
 
-    // if child is a ruby run, just add it normally
     if (child->isRubyRun()) {
         RenderInline::addChild(child, beforeChild);
@@ -84 +83 @@
     }
 
-    if (beforeChild && !isAfterContent(beforeChild)) {
-        // insert child into run
-        ASSERT(!beforeChild->isRubyRun());
-        RenderRubyRun* run = findRubyRunParent(beforeChild);
-        ASSERT(run); // beforeChild should always have a run as parent
-        if (run) {
+    if (beforeChild && !isAfterContent(beforeChild) && !beforeChild->isRubyRun()) {
+        if (RenderRubyRun* run = findRubyRunParent(beforeChild)) {
             run->addChild(child, beforeChild);
             return;
         }
-        ASSERT(false); // beforeChild should always have a run as parent!
+        ASSERT_NOT_REACHED(); // beforeChild should always have a run as parent!
         // Emergency fallback: fall through and just append.
     }