Move rendering/RenderBox to layout/LayoutBox.

Source/core/inspector/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 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
@@ skipping 23 matching lines @@
 #include "bindings/core/v8/V8InspectorOverlayHost.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/dom/PseudoElement.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorClient.h"
 #include "core/inspector/InspectorOverlayHost.h"
+#include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/shapes/ShapeOutsideInfo.h"
 #include "core/layout/style/LayoutStyleConstants.h"
 #include "core/loader/EmptyClients.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/Chrome.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
-#include "core/rendering/RenderBox.h"
 #include "core/rendering/RenderInline.h"
 #include "platform/JSONValues.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 #include <v8.h>
@@ skipping 188 matching lines @@
         return false;
     if (!renderer->isBox() && !renderer->isRenderInline())
         return false;
 
     LayoutRect contentBox;
     LayoutRect paddingBox;
     LayoutRect borderBox;
     LayoutRect marginBox;
 
     if (renderer->isBox()) {
-        RenderBox* renderBox = toRenderBox(renderer);
+        LayoutBox* layoutBox = toLayoutBox(renderer);
 
-        // RenderBox returns the "pure" content area box, exclusive of the scrollbars (if present), which also count towards the content area in CSS.
-        const int verticalScrollbarWidth = renderBox->verticalScrollbarWidth();
-        const int horizontalScrollbarHeight = renderBox->horizontalScrollbarHeight();
-        contentBox = renderBox->contentBoxRect();
+        // LayoutBox returns the "pure" content area box, exclusive of the scrollbars (if present), which also count towards the content area in CSS.
+        const int verticalScrollbarWidth = layoutBox->verticalScrollbarWidth();
+        const int horizontalScrollbarHeight = layoutBox->horizontalScrollbarHeight();
+        contentBox = layoutBox->contentBoxRect();
         contentBox.setWidth(contentBox.width() + verticalScrollbarWidth);
         contentBox.setHeight(contentBox.height() + horizontalScrollbarHeight);
 
-        paddingBox = renderBox->paddingBoxRect();
+        paddingBox = layoutBox->paddingBoxRect();
         paddingBox.setWidth(paddingBox.width() + verticalScrollbarWidth);
         paddingBox.setHeight(paddingBox.height() + horizontalScrollbarHeight);
 
-        borderBox = renderBox->borderBoxRect();
+        borderBox = layoutBox->borderBoxRect();
 
-        marginBox = LayoutRect(borderBox.x() - renderBox->marginLeft(), borderBox.y() - renderBox->marginTop(),
-            borderBox.width() + renderBox->marginWidth(), borderBox.height() + renderBox->marginHeight());
+        marginBox = LayoutRect(borderBox.x() - layoutBox->marginLeft(), borderBox.y() - layoutBox->marginTop(),
+            borderBox.width() + layoutBox->marginWidth(), borderBox.height() + layoutBox->marginHeight());
     } else {
         RenderInline* renderInline = toRenderInline(renderer);
 
         // RenderInline's bounding box includes paddings and borders, excludes margins.
         borderBox = renderInline->linesBoundingBox();
         paddingBox = LayoutRect(borderBox.x() + renderInline->borderLeft(), borderBox.y() + renderInline->borderTop(),
             borderBox.width() - renderInline->borderLeft() - renderInline->borderRight(), borderBox.height() - renderInline->borderTop() - renderInline->borderBottom());
         contentBox = LayoutRect(paddingBox.x() + renderInline->paddingLeft(), paddingBox.y() + renderInline->paddingTop(),
             paddingBox.width() - renderInline->paddingLeft() - renderInline->paddingRight(), paddingBox.height() - renderInline->paddingTop() - renderInline->paddingBottom());
         // Ignore marginTop and marginBottom for inlines.
@@ skipping 298 matching lines @@
     array->addItem(quad.p3().x());
     array->addItem(quad.p3().y());
     array->addItem(quad.p4().x());
     array->addItem(quad.p4().y());
     return array.release();
 }
 
 static const ShapeOutsideInfo* shapeOutsideInfoForNode(Node* node, Shape::DisplayPaths* paths, FloatQuad* bounds)
 {
     LayoutObject* renderer = node->renderer();
-    if (!renderer || !renderer->isBox() || !toRenderBox(renderer)->shapeOutsideInfo())
+    if (!renderer || !renderer->isBox() || !toLayoutBox(renderer)->shapeOutsideInfo())
         return nullptr;
 
     FrameView* containingView = node->document().view();
-    RenderBox* renderBox = toRenderBox(renderer);
-    const ShapeOutsideInfo* shapeOutsideInfo = renderBox->shapeOutsideInfo();
+    LayoutBox* layoutBox = toLayoutBox(renderer);
+    const ShapeOutsideInfo* shapeOutsideInfo = layoutBox->shapeOutsideInfo();
 
     shapeOutsideInfo->computedShape().buildDisplayPaths(*paths);
 
     LayoutRect shapeBounds = shapeOutsideInfo->computedShapePhysicalBoundingBox();
-    *bounds = renderBox->localToAbsoluteQuad(FloatRect(shapeBounds));
+    *bounds = layoutBox->localToAbsoluteQuad(FloatRect(shapeBounds));
     contentsQuadToRootFrame(containingView, *bounds);
 
     return shapeOutsideInfo;
 }
 
 static void appendPathsForShapeOutside(Highlight& highlight, const HighlightConfig& config, Node* node)
 {
     Shape::DisplayPaths paths;
     FloatQuad boundsQuad;
 
@@ skipping 271 matching lines @@
     hideHighlight();
 }
 
 void InspectorOverlay::startedRecordingProfile()
 {
     if (!m_activeProfilerCount++)
         freePage();
 }
 
 } // namespace blink