diff options
Diffstat (limited to 'WebCore/rendering/RenderRubyBase.cpp')
| -rw-r--r-- | WebCore/rendering/RenderRubyBase.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/WebCore/rendering/RenderRubyBase.cpp b/WebCore/rendering/RenderRubyBase.cpp index 65f9bc0..967a054 100644 --- a/WebCore/rendering/RenderRubyBase.cpp +++ b/WebCore/rendering/RenderRubyBase.cpp @@ -103,8 +103,7 @@ void RenderRubyBase::moveInlineChildren(RenderRubyBase* toBase, RenderObject* fr } } // Move our inline children into the target block we determined above. - for (RenderObject* child = firstChild(); child != fromBeforeChild; child = firstChild()) - moveChildTo(toBlock, toBlock->children(), child); + moveChildrenTo(toBlock, firstChild(), fromBeforeChild); } void RenderRubyBase::moveBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild) @@ -118,13 +117,13 @@ void RenderRubyBase::moveBlockChildren(RenderRubyBase* toBase, RenderObject* fro if (child->isAnonymousBlock()) { RenderBlock* anonBlock = toRenderBlock(child); ASSERT(anonBlock->childrenInline()); - ASSERT(!anonBlock->inlineContinuation()); + ASSERT(!anonBlock->inlineElementContinuation()); anonBlock->moveAllChildrenTo(toBase, toBase->children()); anonBlock->deleteLineBoxTree(); anonBlock->destroy(); } else { ASSERT(child->isFloatingOrPositioned()); - moveChildTo(toBase, toBase->children(), child); + moveChildTo(toBase, child); } } } else { @@ -145,9 +144,9 @@ void RenderRubyBase::moveBlockChildren(RenderRubyBase* toBase, RenderObject* fro RenderBlock* anonBlock = toRenderBlock(child); ASSERT(anonBlock->childrenInline()); - ASSERT(!anonBlock->inlineContinuation()); + ASSERT(!anonBlock->inlineElementContinuation()); // Move inline children out of anonymous block. - anonBlock->moveAllChildrenTo(this, children(), anonBlock); + anonBlock->moveAllChildrenTo(this, anonBlock); anonBlock->deleteLineBoxTree(); anonBlock->destroy(); } @@ -181,10 +180,9 @@ void RenderRubyBase::mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fr anonBlockHere->destroy(); } // Move all remaining children normally. - for (RenderObject* child = firstChild(); child != fromBeforeChild; child = firstChild()) - moveChildTo(toBase, toBase->children(), child); + moveChildrenTo(toBase, firstChild(), fromBeforeChild); } } // namespace WebCore -#endif +#endif // ENABLE(RUBY) |