Move rendering/RenderBox to layout/LayoutBox.

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 757 matching lines @@
 {
     return onlyDuringLayout && layoutPending() ? nullptr : m_layoutSubtreeRoot;
 }
 
 inline void FrameView::forceLayoutParentViewIfNeeded()
 {
     LayoutPart* ownerRenderer = m_frame->ownerRenderer();
     if (!ownerRenderer || !ownerRenderer->frame())
         return;
 
-    RenderBox* contentBox = embeddedContentBox();
+    LayoutBox* contentBox = embeddedContentBox();
     if (!contentBox)
         return;
 
     LayoutSVGRoot* svgRoot = toLayoutSVGRoot(contentBox);
     if (svgRoot->everHadLayout() && !svgRoot->needsLayout())
         return;
 
     // If the embedded SVG document appears the first time, the ownerRenderer has already finished
     // layout without knowing about the existence of the embedded SVG document, because LayoutReplaced
     // embeddedContentBox() returns 0, as long as the embedded document isn't loaded yet. Before
@@ skipping 203 matching lines @@
             }
 
             if (needsScrollbarReconstruction())
                 updateScrollbars(scrollOffsetDouble());
 
             LayoutSize oldSize = m_size;
 
             m_size = LayoutSize(layoutSize().width(), layoutSize().height());
 
             if (oldSize != m_size && !m_firstLayout) {
-                RenderBox* rootRenderer = document->documentElement() ? document->documentElement()->renderBox() : 0;
-                RenderBox* bodyRenderer = rootRenderer && document->body() ? document->body()->renderBox() : 0;
+                LayoutBox* rootRenderer = document->documentElement() ? document->documentElement()->layoutBox() : 0;
+                LayoutBox* bodyRenderer = rootRenderer && document->body() ? document->body()->layoutBox() : 0;
                 if (bodyRenderer && bodyRenderer->stretchesToViewport())
                     bodyRenderer->setChildNeedsLayout();
                 else if (rootRenderer && rootRenderer->stretchesToViewport())
                     rootRenderer->setChildNeedsLayout();
             }
 
             // We need to set m_doFullPaintInvalidation before triggering layout as LayoutObject::checkForPaintInvalidation
             // checks the boolean to disable local paint invalidations.
             m_doFullPaintInvalidation |= renderView()->shouldDoFullPaintInvalidationForNextLayout();
         }
@@ skipping 114 matching lines @@
     debugInfo.currentLayoutRects().clear();
     for (LayoutObject* renderer = layoutRoot; renderer; renderer = renderer->nextInPreOrder()) {
         if (renderer->layoutDidGetCalledSinceLastFrame()) {
             FloatQuad quad = renderer->localToAbsoluteQuad(FloatQuad(renderer->previousPaintInvalidationRect()));
             LayoutRect rect = quad.enclosingBoundingBox();
             debugInfo.currentLayoutRects().append(rect);
         }
     }
 }
 
-RenderBox* FrameView::embeddedContentBox() const
+LayoutBox* FrameView::embeddedContentBox() const
 {
     RenderView* renderView = this->renderView();
     if (!renderView)
         return nullptr;
 
     LayoutObject* firstChild = renderView->firstChild();
     if (!firstChild || !firstChild->isBox())
         return nullptr;
 
     // Curently only embedded SVG documents participate in the size-negotiation logic.
     if (firstChild->isSVGRoot())
-        return toRenderBox(firstChild);
+        return toLayoutBox(firstChild);
 
     return nullptr;
 }
 
 
 void FrameView::addPart(LayoutPart* object)
 {
     m_parts.add(object);
 }
 
@@ skipping 745 matching lines @@
     // layout in that case.
 
     RenderView* renderView = this->renderView();
     return layoutPending()
         || (renderView && renderView->needsLayout())
         || isSubtreeLayout();
 }
 
 void FrameView::setNeedsLayout()
 {
-    RenderBox* box = embeddedContentBox();
+    LayoutBox* box = embeddedContentBox();
     // It's illegal to ask for layout changes during the layout compositing or paint invalidation step.
     // FIXME: the third conditional is a hack to support embedded SVG. See FrameView::forceLayoutParentViewIfNeeded and crbug.com/442939
     RELEASE_ASSERT(!m_frame->document() || m_frame->document()->lifecycle().stateAllowsLayoutInvalidation() || (box && box->isSVGRoot()));
 
     if (RenderView* renderView = this->renderView())
         renderView->setNeedsLayout();
 }
 
 bool FrameView::isTransparent() const
 {
@@ skipping 507 matching lines @@
 {
     return m_frame->settings() && m_frame->settings()->scrollAnimatorEnabled();
 }
 
 void FrameView::updateAnnotatedRegions()
 {
     Document* document = m_frame->document();
     if (!document->hasAnnotatedRegions())
         return;
     Vector<AnnotatedRegionValue> newRegions;
-    document->renderBox()->collectAnnotatedRegions(newRegions);
+    document->layoutBox()->collectAnnotatedRegions(newRegions);
     if (newRegions == document->annotatedRegions())
         return;
     document->setAnnotatedRegions(newRegions);
     if (Page* page = m_frame->page())
         page->chrome().client().annotatedRegionsChanged();
 }
 
 void FrameView::updateScrollCorner()
 {
     RefPtr<LayoutStyle> cornerStyle;
@@ skipping 438 matching lines @@
     TextStream ts;
     if (!m_trackedPaintInvalidationRects.isEmpty()) {
         ts << "(repaint rects\n";
         for (size_t i = 0; i < m_trackedPaintInvalidationRects.size(); ++i)
             ts << "  (rect " << m_trackedPaintInvalidationRects[i].x() << " " << m_trackedPaintInvalidationRects[i].y() << " " << m_trackedPaintInvalidationRects[i].width() << " " << m_trackedPaintInvalidationRects[i].height() << ")\n";
         ts << ")\n";
     }
     return ts.release();
 }
 
-void FrameView::addResizerArea(RenderBox& resizerBox)
+void FrameView::addResizerArea(LayoutBox& resizerBox)
 {
     if (!m_resizerAreas)
         m_resizerAreas = adoptPtr(new ResizerAreaSet);
     m_resizerAreas->add(&resizerBox);
 }
 
-void FrameView::removeResizerArea(RenderBox& resizerBox)
+void FrameView::removeResizerArea(LayoutBox& resizerBox)
 {
     if (!m_resizerAreas)
         return;
 
     ResizerAreaSet::iterator it = m_resizerAreas->find(&resizerBox);
     if (it != m_resizerAreas->end())
         m_resizerAreas->remove(it);
 }
 
 void FrameView::addScrollableArea(ScrollableArea* scrollableArea)
@@ skipping 1153 matching lines @@
 {
     Settings* settings = frame().settings();
     if (!settings || !settings->rootLayerScrolls())
         return this;
 
     RenderView* renderView = this->renderView();
     return renderView ? renderView->scrollableArea() : nullptr;
 }
 
 } // namespace blink