Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutRubyBase.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 {
 }
 
 LayoutRubyBase* LayoutRubyBase::createAnonymous(Document* document)
 {
     LayoutRubyBase* layoutObject = new LayoutRubyBase();
     layoutObject->setDocumentForAnonymous(document);
     return layoutObject;
 }
 
-bool LayoutRubyBase::isChildAllowed(RenderObject* child, RenderStyle*) const
+bool LayoutRubyBase::isChildAllowed(LayoutObject* child, RenderStyle*) const
 {
     return child->isInline();
 }
 
-void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
 {
     // This function removes all children that are before (!) beforeChild
     // and appends them to toBase.
     ASSERT_ARG(toBase, toBase);
 
     if (beforeChild && beforeChild->parent() != this)
         beforeChild = splitAnonymousBoxesAroundChild(beforeChild);
 
     if (childrenInline())
         moveInlineChildren(toBase, beforeChild);
     else
         moveBlockChildren(toBase, beforeChild);
 
     setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
     toBase->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
 }
 
-void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
 {
     ASSERT(childrenInline());
     ASSERT_ARG(toBase, toBase);
 
     if (!firstChild())
         return;
 
     RenderBlock* toBlock;
     if (toBase->childrenInline()) {
         // The standard and easy case: move the children into the target base
         toBlock = toBase;
     } else {
         // We need to wrap the inline objects into an anonymous block.
         // If toBase has a suitable block, we re-use it, otherwise create a new one.
-        RenderObject* lastChild = toBase->lastChild();
+        LayoutObject* lastChild = toBase->lastChild();
         if (lastChild && lastChild->isAnonymousBlock() && lastChild->childrenInline()) {
             toBlock = toRenderBlock(lastChild);
         } else {
             toBlock = toBase->createAnonymousBlock();
             toBase->children()->appendChildNode(toBase, toBlock);
         }
     }
     // Move our inline children into the target block we determined above.
     moveChildrenTo(toBlock, firstChild(), beforeChild);
 }
 
-void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
 {
     ASSERT(!childrenInline());
     ASSERT_ARG(toBase, toBase);
 
     if (!firstChild())
         return;
 
     if (toBase->childrenInline())
         toBase->makeChildrenNonInline();
 
     // If an anonymous block would be put next to another such block, then merge those.
-    RenderObject* firstChildHere = firstChild();
-    RenderObject* lastChildThere = toBase->lastChild();
+    LayoutObject* firstChildHere = firstChild();
+    LayoutObject* lastChildThere = toBase->lastChild();
     if (firstChildHere->isAnonymousBlock() && firstChildHere->childrenInline()
         && lastChildThere && lastChildThere->isAnonymousBlock() && lastChildThere->childrenInline()) {
         RenderBlock* anonBlockHere = toRenderBlock(firstChildHere);
         RenderBlock* anonBlockThere = toRenderBlock(lastChildThere);
         anonBlockHere->moveAllChildrenTo(anonBlockThere, anonBlockThere->children());
         anonBlockHere->deleteLineBoxTree();
         anonBlockHere->destroy();
     }
     // Move all remaining children normally.
     moveChildrenTo(toBase, firstChild(), beforeChild);
@@ skipping 11 matching lines @@
         return;
 
     // Inset the ruby base by half the inter-ideograph expansion amount.
     float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportunityCount + 1);
 
     logicalLeft += inset / 2;
     logicalWidth -= inset;
 }
 
 } // namespace blink