Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderFullScreen.cpp

 /*
  * Copyright (C) 2010 Apple 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 27 matching lines @@
 
 class RenderFullScreenPlaceholder final : public RenderBlockFlow {
 public:
     RenderFullScreenPlaceholder(RenderFullScreen* owner)
         : RenderBlockFlow(0)
         , m_owner(owner)
     {
         setDocumentForAnonymous(&owner->document());
     }
 private:
-    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderFullScreenPlaceholder || RenderBlockFlow::isOfType(type); }
+    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderFullScreenPlaceholder || RenderBlockFlow::isOfType(type); }
     virtual void willBeDestroyed() override;
     RenderFullScreen* m_owner;
 };
 
 void RenderFullScreenPlaceholder::willBeDestroyed()
 {
     m_owner->setPlaceholder(0);
     RenderBlockFlow::willBeDestroyed();
 }
 
@@ skipping 13 matching lines @@
 
 void RenderFullScreen::willBeDestroyed()
 {
     if (m_placeholder) {
         remove();
         if (!m_placeholder->beingDestroyed())
             m_placeholder->destroy();
         ASSERT(!m_placeholder);
     }
 
-    // RenderObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
+    // LayoutObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
     // if its RenderFullScreen is destroyed.
     Fullscreen& fullscreen = Fullscreen::from(document());
     if (fullscreen.fullScreenRenderer() == this)
         fullscreen.fullScreenRendererDestroyed();
 
     RenderFlexibleBox::willBeDestroyed();
 }
 
 void RenderFullScreen::updateStyle()
 {
@@ skipping 20 matching lines @@
     } else {
         fullscreenStyle->setWidth(Length(100.0, Percent));
         fullscreenStyle->setHeight(Length(100.0, Percent));
     }
 
     fullscreenStyle->setBackgroundColor(StyleColor(Color::black));
 
     setStyle(fullscreenStyle);
 }
 
-RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, RenderObject* parent, Document* document)
+LayoutObject* RenderFullScreen::wrapRenderer(LayoutObject* object, LayoutObject* parent, Document* document)
 {
     // FIXME: We should not modify the structure of the render tree during
     // layout. crbug.com/370459
     DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
 
     RenderFullScreen* fullscreenRenderer = RenderFullScreen::createAnonymous(document);
     fullscreenRenderer->updateStyle();
     if (parent && !parent->isChildAllowed(fullscreenRenderer, fullscreenRenderer->styleRef())) {
         fullscreenRenderer->destroy();
         return 0;
     }
     if (object) {
         // |object->parent()| can be null if the object is not yet attached
         // to |parent|.
-        if (RenderObject* parent = object->parent()) {
+        if (LayoutObject* parent = object->parent()) {
             RenderBlock* containingBlock = object->containingBlock();
             ASSERT(containingBlock);
             // Since we are moving the |object| to a new parent |fullscreenRenderer|,
             // the line box tree underneath our |containingBlock| is not longer valid.
             containingBlock->deleteLineBoxTree();
 
             parent->addChild(fullscreenRenderer, object);
             object->remove();
 
             // Always just do a full layout to ensure that line boxes get deleted properly.
@@ skipping 11 matching lines @@
     return fullscreenRenderer;
 }
 
 void RenderFullScreen::unwrapRenderer()
 {
     // FIXME: We should not modify the structure of the render tree during
     // layout. crbug.com/370459
     DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
 
     if (parent()) {
-        for (RenderObject* child = firstChild(); child; child = firstChild()) {
+        for (LayoutObject* child = firstChild(); child; child = firstChild()) {
             // We have to clear the override size, because as a flexbox, we
             // may have set one on the child, and we don't want to leave that
             // lying around on the child.
             if (child->isBox())
                 toRenderBox(child)->clearOverrideSize();
             child->remove();
             parent()->addChild(child, this);
             parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
         }
     }
@@ skipping 18 matching lines @@
     if (!m_placeholder) {
         m_placeholder = new RenderFullScreenPlaceholder(this);
         m_placeholder->setStyle(style);
         if (parent()) {
             parent()->addChild(m_placeholder, this);
             parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
         }
     } else
         m_placeholder->setStyle(style);
 }