Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/LayoutState.cpp

 /*
  * Copyright (C) 2007 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 48 matching lines @@
     bool fixed = renderer.isOutOfFlowPositioned() && renderer.style()->position() == FixedPosition;
     if (fixed) {
         // FIXME: This doesn't work correctly with transforms.
         FloatPoint fixedOffset = renderer.view()->localToAbsolute(FloatPoint(), IsFixed);
         m_layoutOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset;
     } else {
         m_layoutOffset = m_next->m_layoutOffset + offset;
     }
 
     if (renderer.isOutOfFlowPositioned() && !fixed) {
-        if (RenderObject* container = renderer.container()) {
+        if (LayoutObject* container = renderer.container()) {
             if (container->style()->hasInFlowPosition() && container->isRenderInline())
                 m_layoutOffset += toRenderInline(container)->offsetForInFlowPositionedInline(renderer);
         }
     }
     // If we establish a new page height, then cache the offset to the top of the first page.
     // We can compare this later on to figure out what part of the page we're actually on,
     if (pageLogicalHeight || m_columnInfo || renderer.isRenderFlowThread()) {
         m_pageLogicalHeight = pageLogicalHeight;
         bool isFlipped = renderer.style()->isFlippedBlocksWritingMode();
         m_pageOffset = LayoutSize(m_layoutOffset.width() + (!isFlipped ? renderer.borderLeft() + renderer.paddingLeft() : renderer.borderRight() + renderer.paddingRight()),
@@ skipping 15 matching lines @@
             m_isPaginated = m_pageLogicalHeight || m_next->m_columnInfo || renderer.flowThreadContainingBlock();
         }
     }
 
     if (!m_columnInfo)
         m_columnInfo = m_next->m_columnInfo;
 
     // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
 }
 
-LayoutState::LayoutState(RenderObject& root)
+LayoutState::LayoutState(LayoutObject& root)
     : m_isPaginated(false)
     , m_pageLogicalHeightChanged(false)
     , m_containingBlockLogicalWidthChanged(false)
     , m_flowThread(0)
     , m_columnInfo(0)
     , m_next(root.view()->layoutState())
     , m_pageLogicalHeight(0)
     , m_renderer(root)
 {
     ASSERT(!m_next);
     // We'll end up pushing in RenderView itself, so don't bother adding it.
     if (root.isRenderView())
         return;
 
     root.view()->pushLayoutState(*this);
 
-    RenderObject* container = root.container();
+    LayoutObject* container = root.container();
     FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms);
     m_layoutOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());
 }
 
 LayoutState::~LayoutState()
 {
     if (m_renderer.view()->layoutState()) {
         ASSERT(m_renderer.view()->layoutState() == this);
         m_renderer.view()->popLayoutState();
     }
@@ skipping 14 matching lines @@
 }
 
 void LayoutState::addForcedColumnBreak(const RenderBox& child, const LayoutUnit& childLogicalOffset)
 {
     if (!m_columnInfo || m_columnInfo->columnHeight())
         return;
     m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset));
 }
 
 } // namespace blink