Source/WebCore: Issues with merging ruby bases.
[WebKit.git] / Source / WebCore / ChangeLog
index e3d4761..8101729 100644 (file)
@@ -1,3 +1,29 @@
+2011-09-19  Abhishek Arya  <inferno@chromium.org>
+
+        Issues with merging ruby bases.
+        https://bugs.webkit.org/show_bug.cgi?id=67240
+
+        Reviewed by James Robinson.
+
+        1) Change fromBeforeChild to beforeChild to match
+        webkit rendering naming conventions.
+        2) Add assert to verify ruby base is indeed emptied
+        after collecting all children in a single base.
+        3) Fix condition in mergeBlockChildren to bail out only
+        when we have no children and there is no work to merge
+        children to toBase.
+
+        Test: fast/ruby/ruby-overhang-crash.html
+
+        * rendering/RenderRubyBase.cpp:
+        (WebCore::RenderRubyBase::moveChildren):
+        (WebCore::RenderRubyBase::moveInlineChildren):
+        (WebCore::RenderRubyBase::moveBlockChildren):
+        (WebCore::RenderRubyBase::mergeBlockChildren):
+        * rendering/RenderRubyBase.h:
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::removeChild):
+
 2011-09-16  Abhishek Arya  <inferno@chromium.org>
 
         Child not placed correctly when beforeChild (table part)