Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/shapes/ShapeOutsideInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. 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.
@@ skipping 14 matching lines @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/layout/shapes/ShapeOutsideInfo.h"
 
 #include "core/inspector/ConsoleMessage.h"
 #include "core/layout/FloatingObjects.h"
+#include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutImage.h"
 #include "core/rendering/RenderBlockFlow.h"
-#include "core/rendering/RenderBox.h"
 #include "platform/LengthFunctions.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 CSSBoxType referenceBox(const ShapeValue& shapeValue)
 {
     if (shapeValue.cssBox() == BoxMissing)
         return MarginBox;
     return shapeValue.cssBox();
@@ skipping 44 matching lines @@
     if (imageResource.isAccessAllowed(&document, document.securityOrigin()))
         return true;
 
     const KURL& url = imageResource.url();
     String urlString = url.isNull() ? "''" : url.elidedString();
     document.addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Unsafe attempt to load URL " + urlString + "."));
 
     return false;
 }
 
-static LayoutRect getShapeImageMarginRect(const RenderBox& renderBox, const LayoutSize& referenceBoxLogicalSize)
+static LayoutRect getShapeImageMarginRect(const LayoutBox& layoutBox, const LayoutSize& referenceBoxLogicalSize)
 {
-    LayoutPoint marginBoxOrigin(-renderBox.marginLogicalLeft() - renderBox.borderAndPaddingLogicalLeft(), -renderBox.marginBefore() - renderBox.borderBefore() - renderBox.paddingBefore());
-    LayoutSize marginBoxSizeDelta(renderBox.marginLogicalWidth() + renderBox.borderAndPaddingLogicalWidth(), renderBox.marginLogicalHeight() + renderBox.borderAndPaddingLogicalHeight());
+    LayoutPoint marginBoxOrigin(-layoutBox.marginLogicalLeft() - layoutBox.borderAndPaddingLogicalLeft(), -layoutBox.marginBefore() - layoutBox.borderBefore() - layoutBox.paddingBefore());
+    LayoutSize marginBoxSizeDelta(layoutBox.marginLogicalWidth() + layoutBox.borderAndPaddingLogicalWidth(), layoutBox.marginLogicalHeight() + layoutBox.borderAndPaddingLogicalHeight());
     LayoutSize marginRectSize(referenceBoxLogicalSize + marginBoxSizeDelta);
     marginRectSize.clampNegativeToZero();
     return LayoutRect(marginBoxOrigin, marginRectSize);
 }
 
 static bool isValidRasterShapeRect(const LayoutRect& rect)
 {
     static double maxImageSizeBytes = 0;
     if (!maxImageSizeBytes) {
         size_t size32MaxBytes =  0xFFFFFFFF / 4; // Some platforms don't limit maxDecodedImageBytes.
@@ skipping 11 matching lines @@
     const LayoutRect& imageRect = (m_renderer.isLayoutImage())
         ? toLayoutImage(m_renderer).replacedContentRect()
         : LayoutRect(LayoutPoint(), LayoutSize(imageSize));
 
     if (!isValidRasterShapeRect(marginRect) || !isValidRasterShapeRect(imageRect)) {
         m_renderer.document().addConsoleMessage(ConsoleMessage::create(RenderingMessageSource, ErrorMessageLevel, "The shape-outside image is too large."));
         return Shape::createEmptyRasterShape(writingMode, margin);
     }
 
     ASSERT(!styleImage->isPendingImage());
-    RefPtr<Image> image = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
+    RefPtr<Image> image = styleImage->image(const_cast<LayoutBox*>(&m_renderer), imageSize);
 
     return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, writingMode, margin);
 }
 
 const Shape& ShapeOutsideInfo::computedShape() const
 {
     if (Shape* shape = m_shape.get())
         return *shape;
 
     TemporaryChange<bool> isInComputingShape(m_isComputingShape, true);
@@ skipping 23 matching lines @@
         const FloatRoundedRect& shapeRect = style.getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
         m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin);
         break;
     }
     }
 
     ASSERT(m_shape);
     return *m_shape;
 }
 
-inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)
+inline LayoutUnit borderBeforeInWritingMode(const LayoutBox& renderer, WritingMode writingMode)
 {
     switch (writingMode) {
     case TopToBottomWritingMode: return renderer.borderTop();
     case BottomToTopWritingMode: return renderer.borderBottom();
     case LeftToRightWritingMode: return renderer.borderLeft();
     case RightToLeftWritingMode: return renderer.borderRight();
     }
 
     ASSERT_NOT_REACHED();
     return renderer.borderBefore();
 }
 
-inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)
+inline LayoutUnit borderAndPaddingBeforeInWritingMode(const LayoutBox& renderer, WritingMode writingMode)
 {
     switch (writingMode) {
     case TopToBottomWritingMode: return renderer.borderTop() + renderer.paddingTop();
     case BottomToTopWritingMode: return renderer.borderBottom() + renderer.paddingBottom();
     case LeftToRightWritingMode: return renderer.borderLeft() + renderer.paddingLeft();
     case RightToLeftWritingMode: return renderer.borderRight() + renderer.paddingRight();
     }
 
     ASSERT_NOT_REACHED();
     return renderer.borderAndPaddingBefore();
 }
 
 LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
 {
     switch (referenceBox(*m_renderer.style()->shapeOutside())) {
     case MarginBox: return -m_renderer.marginBefore(m_renderer.containingBlock()->style());
     case BorderBox: return LayoutUnit();
     case PaddingBox: return borderBeforeInWritingMode(m_renderer, m_renderer.containingBlock()->style()->writingMode());
     case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer, m_renderer.containingBlock()->style()->writingMode());
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
-inline LayoutUnit borderStartWithStyleForWritingMode(const RenderBox& renderer, const LayoutStyle* style)
+inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
 {
     if (style->isHorizontalWritingMode()) {
         if (style->isLeftToRightDirection())
             return renderer.borderLeft();
 
         return renderer.borderRight();
     }
     if (style->isLeftToRightDirection())
         return renderer.borderTop();
 
     return renderer.borderBottom();
 }
 
-inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const RenderBox& renderer, const LayoutStyle* style)
+inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
 {
     if (style->isHorizontalWritingMode()) {
         if (style->isLeftToRightDirection())
             return renderer.borderLeft() + renderer.paddingLeft();
 
         return renderer.borderRight() + renderer.paddingRight();
     }
     if (style->isLeftToRightDirection())
         return renderer.borderTop() + renderer.paddingTop();
 
     return renderer.borderBottom() + renderer.paddingBottom();
 }
 
 LayoutUnit ShapeOutsideInfo::logicalLeftOffset() const
 {
     switch (referenceBox(*m_renderer.style()->shapeOutside())) {
     case MarginBox: return -m_renderer.marginStart(m_renderer.containingBlock()->style());
     case BorderBox: return LayoutUnit();
     case PaddingBox: return borderStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
     case ContentBox: return borderAndPaddingStartWithStyleForWritingMode(m_renderer, m_renderer.containingBlock()->style());
     case BoxMissing: break;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 
-bool ShapeOutsideInfo::isEnabledFor(const RenderBox& box)
+bool ShapeOutsideInfo::isEnabledFor(const LayoutBox& box)
 {
     ShapeValue* shapeValue = box.style()->shapeOutside();
     if (!box.isFloating() || !shapeValue)
         return false;
 
     switch (shapeValue->type()) {
     case ShapeValue::Shape:
         return shapeValue->shape();
     case ShapeValue::Image:
         return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()));
@@ skipping 68 matching lines @@
 }
 
 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
 {
     if (!m_renderer.style()->isHorizontalWritingMode())
         return size.transposedSize();
     return size;
 }
 
 } // namespace blink