Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutRuby.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 23 matching lines @@
 
 #include "core/frame/UseCounter.h"
 #include "core/layout/LayoutRubyRun.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 // === generic helper functions to avoid excessive code duplication ===
 
-static inline bool isAnonymousRubyInlineBlock(const RenderObject* object)
+static inline bool isAnonymousRubyInlineBlock(const LayoutObject* object)
 {
     ASSERT(!object
         || !object->parent()->isRuby()
         || object->isRubyRun()
         || (object->isInline() && (object->isBeforeContent() || object->isAfterContent()))
         || (object->isAnonymous() && object->isRenderBlock() && object->style()->display() == INLINE_BLOCK));
 
     return object
         && object->parent()->isRuby()
         && object->isRenderBlock()
         && !object->isRubyRun();
 }
 
-static inline bool isRubyBeforeBlock(const RenderObject* object)
+static inline bool isRubyBeforeBlock(const LayoutObject* object)
 {
     return isAnonymousRubyInlineBlock(object)
         && !object->previousSibling()
         && toRenderBlock(object)->firstChild()
         && toRenderBlock(object)->firstChild()->style()->styleType() == BEFORE;
 }
 
-static inline bool isRubyAfterBlock(const RenderObject* object)
+static inline bool isRubyAfterBlock(const LayoutObject* object)
 {
     return isAnonymousRubyInlineBlock(object)
         && !object->nextSibling()
         && toRenderBlock(object)->firstChild()
         && toRenderBlock(object)->firstChild()->style()->styleType() == AFTER;
 }
 
-static inline RenderBlock* rubyBeforeBlock(const RenderObject* ruby)
+static inline RenderBlock* rubyBeforeBlock(const LayoutObject* ruby)
 {
-    RenderObject* child = ruby->slowFirstChild();
+    LayoutObject* child = ruby->slowFirstChild();
     return isRubyBeforeBlock(child) ? toRenderBlock(child) : 0;
 }
 
-static inline RenderBlock* rubyAfterBlock(const RenderObject* ruby)
+static inline RenderBlock* rubyAfterBlock(const LayoutObject* ruby)
 {
-    RenderObject* child = ruby->slowLastChild();
+    LayoutObject* child = ruby->slowLastChild();
     return isRubyAfterBlock(child) ? toRenderBlock(child) : 0;
 }
 
-static RenderBlockFlow* createAnonymousRubyInlineBlock(RenderObject* ruby)
+static RenderBlockFlow* createAnonymousRubyInlineBlock(LayoutObject* ruby)
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(ruby->style(), INLINE_BLOCK);
     RenderBlockFlow* newBlock = RenderBlockFlow::createAnonymous(&ruby->document());
     newBlock->setStyle(newStyle.release());
     return newBlock;
 }
 
-static LayoutRubyRun* lastRubyRun(const RenderObject* ruby)
+static LayoutRubyRun* lastRubyRun(const LayoutObject* ruby)
 {
-    RenderObject* child = ruby->slowLastChild();
+    LayoutObject* child = ruby->slowLastChild();
     if (child && !child->isRubyRun())
         child = child->previousSibling();
     ASSERT(!child || child->isRubyRun() || child->isBeforeContent() || child == rubyBeforeBlock(ruby));
     return child && child->isRubyRun() ? toLayoutRubyRun(child) : 0;
 }
 
-static inline LayoutRubyRun* findRubyRunParent(RenderObject* child)
+static inline LayoutRubyRun* findRubyRunParent(LayoutObject* child)
 {
     while (child && !child->isRubyRun())
         child = child->parent();
     return toLayoutRubyRun(child);
 }
 
 // === ruby as inline object ===
 
 LayoutRubyAsInline::LayoutRubyAsInline(Element* element)
     : RenderInline(element)
 {
     UseCounter::count(document(), UseCounter::RenderRuby);
 }
 
 LayoutRubyAsInline::~LayoutRubyAsInline()
 {
 }
 
 void LayoutRubyAsInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderInline::styleDidChange(diff, oldStyle);
     propagateStyleToAnonymousChildren();
 }
 
-void LayoutRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild)
+void LayoutRubyAsInline::addChild(LayoutObject* child, LayoutObject* beforeChild)
 {
     // Insert :before and :after content before/after the LayoutRubyRun(s)
     if (child->isBeforeContent()) {
         if (child->isInline()) {
             // Add generated inline content normally
             RenderInline::addChild(child, firstChild());
         } else {
             // Wrap non-inline content with an anonymous inline-block.
             RenderBlock* beforeBlock = rubyBeforeBlock(this);
             if (!beforeBlock) {
@@ skipping 21 matching lines @@
     }
 
     // If the child is a ruby run, just add it normally.
     if (child->isRubyRun()) {
         RenderInline::addChild(child, beforeChild);
         return;
     }
 
     if (beforeChild && !isAfterContent(beforeChild)) {
         // insert child into run
-        RenderObject* run = beforeChild;
+        LayoutObject* run = beforeChild;
         while (run && !run->isRubyRun())
             run = run->parent();
         if (run) {
             if (beforeChild == run)
                 beforeChild = toLayoutRubyRun(beforeChild)->firstChild();
             ASSERT(!beforeChild || beforeChild->isDescendantOf(run));
             run->addChild(child, beforeChild);
             return;
         }
         ASSERT_NOT_REACHED(); // beforeChild should always have a run as parent!
         // Emergency fallback: fall through and just append.
     }
 
     // If the new child would be appended, try to add the child to the previous run
     // if possible, or create a new run otherwise.
     // (The LayoutRubyRun object will handle the details)
     LayoutRubyRun* lastRun = lastRubyRun(this);
     if (!lastRun || lastRun->hasRubyText()) {
         lastRun = LayoutRubyRun::staticCreateRubyRun(this);
         RenderInline::addChild(lastRun, beforeChild);
     }
     lastRun->addChild(child);
 }
 
-void LayoutRubyAsInline::removeChild(RenderObject* child)
+void LayoutRubyAsInline::removeChild(LayoutObject* child)
 {
     // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
     // just use the normal remove method.
     if (child->parent() == this) {
         ASSERT(child->isRubyRun() || child->isBeforeContent() || child->isAfterContent() || isAnonymousRubyInlineBlock(child));
         RenderInline::removeChild(child);
         return;
     }
     // If the child's parent is an anoymous block (must be generated :before/:after content)
     // just use the block's remove method.
@@ skipping 21 matching lines @@
 LayoutRubyAsBlock::~LayoutRubyAsBlock()
 {
 }
 
 void LayoutRubyAsBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBlockFlow::styleDidChange(diff, oldStyle);
     propagateStyleToAnonymousChildren();
 }
 
-void LayoutRubyAsBlock::addChild(RenderObject* child, RenderObject* beforeChild)
+void LayoutRubyAsBlock::addChild(LayoutObject* child, LayoutObject* beforeChild)
 {
     // Insert :before and :after content before/after the LayoutRubyRun(s)
     if (child->isBeforeContent()) {
         if (child->isInline()) {
             // Add generated inline content normally
             RenderBlockFlow::addChild(child, firstChild());
         } else {
             // Wrap non-inline content with an anonymous inline-block.
             RenderBlock* beforeBlock = rubyBeforeBlock(this);
             if (!beforeBlock) {
@@ skipping 21 matching lines @@
     }
 
     // If the child is a ruby run, just add it normally.
     if (child->isRubyRun()) {
         RenderBlockFlow::addChild(child, beforeChild);
         return;
     }
 
     if (beforeChild && !isAfterContent(beforeChild)) {
         // insert child into run
-        RenderObject* run = beforeChild;
+        LayoutObject* run = beforeChild;
         while (run && !run->isRubyRun())
             run = run->parent();
         if (run) {
             if (beforeChild == run)
                 beforeChild = toLayoutRubyRun(beforeChild)->firstChild();
             ASSERT(!beforeChild || beforeChild->isDescendantOf(run));
             run->addChild(child, beforeChild);
             return;
         }
         ASSERT_NOT_REACHED(); // beforeChild should always have a run as parent!
         // Emergency fallback: fall through and just append.
     }
 
     // If the new child would be appended, try to add the child to the previous run
     // if possible, or create a new run otherwise.
     // (The LayoutRubyRun object will handle the details)
     LayoutRubyRun* lastRun = lastRubyRun(this);
     if (!lastRun || lastRun->hasRubyText()) {
         lastRun = LayoutRubyRun::staticCreateRubyRun(this);
         RenderBlockFlow::addChild(lastRun, beforeChild);
     }
     lastRun->addChild(child);
 }
 
-void LayoutRubyAsBlock::removeChild(RenderObject* child)
+void LayoutRubyAsBlock::removeChild(LayoutObject* child)
 {
     // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
     // just use the normal remove method.
     if (child->parent() == this) {
         ASSERT(child->isRubyRun() || child->isBeforeContent() || child->isAfterContent() || isAnonymousRubyInlineBlock(child));
         RenderBlockFlow::removeChild(child);
         return;
     }
     // If the child's parent is an anoymous block (must be generated :before/:after content)
     // just use the block's remove method.
     if (isAnonymousRubyInlineBlock(child->parent())) {
         ASSERT(child->isBeforeContent() || child->isAfterContent());
         child->parent()->removeChild(child);
         removeChild(child->parent());
         return;
     }
 
     // Otherwise find the containing run and remove it from there.
     LayoutRubyRun* run = findRubyRunParent(child);
     ASSERT(run);
     run->removeChild(child);
 }
 
 } // namespace blink