Move rendering/RenderObject to layout/LayoutObject.

Move rendering/RenderObject to layout/LayoutObject.

This CL moves the various RenderObject* fromes from rendering to layout/
and renames from Render* to Layout* as needed.

TBRing the move/rename.

jchaffraix@ for core/
mkwst@ for platform/ and web/
pfeldman@ for devtools/
dmazzoni@ for accessibility

BUG=450612
TBR=jchaffraix@chromium.org, mkwst@chromium.org, pfeldman@chromium.org, dmazzoni@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=189594

[Mike West, 2015-02-05 05:23:36]

LGTM.

[dstockwell, 2015-02-05 05:31:13]

https://codereview.chromium.org/899163003/diff/1/Source/core/animation/css/CS...
File Source/core/animation/css/CSSAnimations.cpp (right):

https://codereview.chromium.org/899163003/diff/1/Source/core/animation/css/CS...
Source/core/animation/css/CSSAnimations.cpp:522: const LayoutObject* renderer =
animatingElement->renderer();
Do you plan to rename these at some point, or will LayoutObjects still be
referred to as renderers?

[dsinclair, 2015-02-05 14:33:08]

On 2015/02/05 at 05:31:13, dstockwell wrote:
>
https://codereview.chromium.org/899163003/diff/1/Source/core/animation/css/CS...
> File Source/core/animation/css/CSSAnimations.cpp (right):
> 
>
https://codereview.chromium.org/899163003/diff/1/Source/core/animation/css/CS...
> Source/core/animation/css/CSSAnimations.cpp:522: const LayoutObject* renderer
= animatingElement->renderer();
> Do you plan to rename these at some point, or will LayoutObjects still be
referred to as renderers?


That's the plan yes, but this CL is already pretty large so going to do it in a
separate change.

[dsinclair, 2015-02-05 16:07:23]

New patchsets have been uploaded after l-g-t-m from mkwst@chromium.org

[dsinclair, 2015-02-05 16:08:47]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2015-02-05 16:09:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899163003/10001

[commit-bot: I haz the power, 2015-02-05 16:12:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-05 16:12:48]

Failed to apply patch for Source/core/layout/LayoutObject.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         Source/core/layout/LayoutObject.cpp
  Copied Source/core/rendering/RenderObject.cpp ->
Source/core/layout/LayoutObject.cpp
  patching file Source/core/layout/LayoutObject.cpp
  Hunk #5 FAILED at 131.
  1 out of 147 hunks FAILED -- saving rejects to file
Source/core/layout/LayoutObject.cpp.rej

Patch:   NR 
Source/core/rendering/RenderObject.cpp->Source/core/layout/LayoutObject.cpp
Index: Source/core/layout/LayoutObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp
b/Source/core/layout/LayoutObject.cpp
similarity index 85%
rename from Source/core/rendering/RenderObject.cpp
rename to Source/core/layout/LayoutObject.cpp
index
3eaf86eacfb89c7777bcb40f5ce5c383965ced54..e069bc5a173b018dd3be8148180838b7e823fe24
100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/resolver/StyleResolver.h"
@@ -51,6 +51,7 @@
 #include "core/layout/HitTestResult.h"
 #include "core/layout/Layer.h"
 #include "core/layout/LayoutCounter.h"
+#include "core/layout/LayoutObjectInlines.h"
 #include "core/layout/LayoutTableCaption.h"
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutTableCol.h"
@@ -72,7 +73,6 @@
 #include "core/rendering/RenderInline.h"
 #include "core/rendering/RenderListItem.h"
 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h"
-#include "core/rendering/RenderObjectInlines.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderScrollbarPart.h"
 #include "core/rendering/RenderView.h"
@@ -106,21 +106,21 @@ using namespace HTMLNames;
 
 #if ENABLE(ASSERT)
 
-RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject&
renderObject)
-    : m_renderObject(renderObject)
-    , m_preexistingForbidden(m_renderObject.isSetNeedsLayoutForbidden())
+LayoutObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(LayoutObject&
layoutObject)
+    : m_layoutObject(layoutObject)
+    , m_preexistingForbidden(m_layoutObject.isSetNeedsLayoutForbidden())
 {
-    m_renderObject.setNeedsLayoutIsForbidden(true);
+    m_layoutObject.setNeedsLayoutIsForbidden(true);
 }
 
-RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
+LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
 {
-    m_renderObject.setNeedsLayoutIsForbidden(m_preexistingForbidden);
+    m_layoutObject.setNeedsLayoutIsForbidden(m_preexistingForbidden);
 }
 #endif
 
-struct SameSizeAsRenderObject {
-    virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer.
+struct SameSizeAsLayoutObject {
+    virtual ~SameSizeAsLayoutObject() { } // Allocate vtable pointer.
     void* pointers[5];
 #if ENABLE(ASSERT)
     unsigned m_debugBitfields : 2;
@@ -131,26 +131,26 @@ struct SameSizeAsRenderObject {
     LayoutPoint position; // Stores the previous position from the paint
invalidation container.
 };
 
-static_assert(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject),
"RenderObject should stay small");
+static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject),
"LayoutObject should stay small");
 
-bool RenderObject::s_affectsParentBlock = false;
+bool LayoutObject::s_affectsParentBlock = false;
 
-typedef HashMap<const RenderObject*, LayoutRect> SelectionPaintInvalidationMap;
+typedef HashMap<const LayoutObject*, LayoutRect> SelectionPaintInvalidationMap;
 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0;
 
-void* RenderObject::operator new(size_t sz)
+void* LayoutObject::operator new(size_t sz)
 {
     ASSERT(isMainThread());
     return partitionAlloc(Partitions::getRenderingPartition(), sz);
 }
 
-void RenderObject::operator delete(void* ptr)
+void LayoutObject::operator delete(void* ptr)
 {
     ASSERT(isMainThread());
     partitionFree(ptr);
 }
 
-RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
+LayoutObject* LayoutObject::createObject(Element* element, RenderStyle* style)
 {
     ASSERT(isAllowedToModifyRenderTreeStructure(element->document()));
 
@@ -167,8 +167,9 @@ RenderObject* RenderObject::createObject(Element* element,
RenderStyle* style)
         if (const StyleImage* styleImage =
toImageContentData(contentData)->image()) {
            
image->setImageResource(RenderImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
             image->setIsGeneratedContent();
-        } else
+        } else {
             image->setImageResource(RenderImageResource::create());
+        }
         image->setStyleInternal(nullptr);
         return image;
     }
@@ -213,10 +214,10 @@ RenderObject* RenderObject::createObject(Element* element,
RenderStyle* style)
     return 0;
 }
 
-DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter,
("RenderObject"));
-unsigned RenderObject::s_instanceCount = 0;
+DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, layoutObjectCounter,
("LayoutObject"));
+unsigned LayoutObject::s_instanceCount = 0;
 
-RenderObject::RenderObject(Node* node)
+LayoutObject::LayoutObject(Node* node)
     : ImageResourceClient()
     , m_style(nullptr)
     , m_node(node)
@@ -230,21 +231,21 @@ RenderObject::RenderObject(Node* node)
     , m_bitfields(node)
 {
 #ifndef NDEBUG
-    renderObjectCounter.increment();
+    layoutObjectCounter.increment();
 #endif
     ++s_instanceCount;
 }
 
-RenderObject::~RenderObject()
+LayoutObject::~LayoutObject()
 {
     ASSERT(!m_hasAXObject);
 #ifndef NDEBUG
-    renderObjectCounter.decrement();
+    layoutObjectCounter.decrement();
 #endif
     --s_instanceCount;
 }
 
-String RenderObject::debugName() const
+String LayoutObject::debugName() const
 {
     StringBuilder name;
     name.append(renderName());
@@ -257,28 +258,28 @@ String RenderObject::debugName() const
     return name.toString();
 }
 
-bool RenderObject::isDescendantOf(const RenderObject* obj) const
+bool LayoutObject::isDescendantOf(const LayoutObject* obj) const
 {
-    for (const RenderObject* r = this; r; r = r->m_parent) {
+    for (const LayoutObject* r = this; r; r = r->m_parent) {
         if (r == obj)
             return true;
     }
     return false;
 }
 
-bool RenderObject::isHR() const
+bool LayoutObject::isHR() const
 {
     return isHTMLHRElement(node());
 }
 
-bool RenderObject::isLegend() const
+bool LayoutObject::isLegend() const
 {
     return isHTMLLegendElement(node());
 }
 
-void RenderObject::setFlowThreadStateIncludingDescendants(FlowThreadState
state)
+void LayoutObject::setFlowThreadStateIncludingDescendants(FlowThreadState
state)
 {
-    for (RenderObject *object = this; object; object =
object->nextInPreOrder(this)) {
+    for (LayoutObject *object = this; object; object =
object->nextInPreOrder(this)) {
         // If object is a fragmentation context it already updated the
descendants flag accordingly.
         if (object->isRenderFlowThread())
             continue;
@@ -287,7 +288,7 @@ void
RenderObject::setFlowThreadStateIncludingDescendants(FlowThreadState state)
     }
 }
 
-bool RenderObject::requiresAnonymousTableWrappers(const RenderObject* newChild)
const
+bool LayoutObject::requiresAnonymousTableWrappers(const LayoutObject* newChild)
const
 {
     // Check should agree with:
     // CSS 2.1 Tables: 17.2.1 Anonymous table objects
@@ -308,11 +309,11 @@ bool RenderObject::requiresAnonymousTableWrappers(const
RenderObject* newChild)
     return false;
 }
 
-void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild)
+void LayoutObject::addChild(LayoutObject* newChild, LayoutObject* beforeChild)
 {
     ASSERT(isAllowedToModifyRenderTreeStructure(document()));
 
-    RenderObjectChildList* children = virtualChildren();
+    LayoutObjectChildList* children = virtualChildren();
     ASSERT(children);
     if (!children)
         return;
@@ -322,16 +323,17 @@ void RenderObject::addChild(RenderObject* newChild,
RenderObject* beforeChild)
         // Per: 17.2.1 Anonymous table objects 3. Generate missing parents
         // http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes
         LayoutTable* table;
-        RenderObject* afterChild = beforeChild ? beforeChild->previousSibling()
: children->lastChild();
-        if (afterChild && afterChild->isAnonymous() && afterChild->isTable() &&
!afterChild->isBeforeContent())
+        LayoutObject* afterChild = beforeChild ? beforeChild->previousSibling()
: children->lastChild();
+        if (afterChild && afterChild->isAnonymous() && afterChild->isTable() &&
!afterChild->isBeforeContent()) {
             table = toLayoutTable(afterChild);
-        else {
+        } else {
             table = LayoutTable::createAnonymousWithParentRenderer(this);
             addChild(table, beforeChild);
         }
         table->addChild(newChild);
-    } else
+    } else {
         children->insertChildNode(this, newChild, beforeChild);
+    }
 
     if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE)
         toRenderText(newChild)->transformText();
@@ -348,11 +350,11 @@ void RenderObject::addChild(RenderObject* newChild,
RenderObject* beforeChild)
         toLayoutLayerModelObject(newChild)->layer()->removeOnlyThisLayer();
 }
 
-void RenderObject::removeChild(RenderObject* oldChild)
+void LayoutObject::removeChild(LayoutObject* oldChild)
 {
     ASSERT(isAllowedToModifyRenderTreeStructure(document()));
 
-    RenderObjectChildList* children = virtualChildren();
+    LayoutObjectChildList* children = virtualChildren();
     ASSERT(children);
     if (!children)
         return;
@@ -360,17 +362,17 @@ void RenderObject::removeChild(RenderObject* oldChild)
     children->removeChildNode(this, oldChild);
 }
 
-RenderObject* RenderObject…
(message too large)

[dsinclair, 2015-02-05 17:14:37]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2015-02-05 17:14:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899163003/20001

[dsinclair, 2015-02-05 18:04:50]

The CQ bit was unchecked by dsinclair@chromium.org

[dsinclair, 2015-02-05 19:09:19]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2015-02-05 19:09:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899163003/30001

[dsinclair, 2015-02-05 19:21:55]

The CQ bit was unchecked by dsinclair@chromium.org

[dsinclair, 2015-02-05 19:39:33]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2015-02-05 19:40:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899163003/50001

[dsinclair, 2015-02-05 21:23:25]

The CQ bit was unchecked by dsinclair@chromium.org

[dsinclair, 2015-02-05 21:28:31]

The CQ bit was checked by dsinclair@chromium.org

[commit-bot: I haz the power, 2015-02-05 21:29:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/899163003/60001

[commit-bot: I haz the power, 2015-02-06 00:06:10]

Committed patchset #7 (id:60001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=189594