Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/shapes/ShapeOutsideInfo.h

 /*
  * 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 22 matching lines @@
 #include "core/layout/shapes/Shape.h"
 #include "core/layout/style/LayoutStyle.h"
 #include "core/layout/style/ShapeValue.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutSize.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class RenderBlockFlow;
-class RenderBox;
+class LayoutBox;
 class FloatingObject;
 
 class ShapeOutsideDeltas final {
 public:
     ShapeOutsideDeltas()
         : m_lineOverlapsShape(false)
         , m_isValid(false)
     {
     }
 
@@ skipping 31 matching lines @@
 public:
     void setReferenceBoxLogicalSize(LayoutSize);
 
     LayoutUnit shapeLogicalTop() const { return computedShape().shapeMarginLogicalBoundingBox().y() + logicalTopOffset(); }
     LayoutUnit shapeLogicalBottom() const { return computedShape().shapeMarginLogicalBoundingBox().maxY() + logicalTopOffset(); }
     LayoutUnit shapeLogicalLeft() const { return computedShape().shapeMarginLogicalBoundingBox().x() + logicalLeftOffset(); }
     LayoutUnit shapeLogicalRight() const { return computedShape().shapeMarginLogicalBoundingBox().maxX() + logicalLeftOffset(); }
     LayoutUnit shapeLogicalWidth() const { return computedShape().shapeMarginLogicalBoundingBox().width(); }
     LayoutUnit shapeLogicalHeight() const { return computedShape().shapeMarginLogicalBoundingBox().height(); }
 
-    static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox& renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); }
-    static bool isEnabledFor(const RenderBox&);
+    static PassOwnPtr<ShapeOutsideInfo> createInfo(const LayoutBox& renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); }
+    static bool isEnabledFor(const LayoutBox&);
 
     ShapeOutsideDeltas computeDeltasForContainingBlockLine(const RenderBlockFlow&, const FloatingObject&, LayoutUnit lineTop, LayoutUnit lineHeight);
 
-    static ShapeOutsideInfo& ensureInfo(const RenderBox& key)
+    static ShapeOutsideInfo& ensureInfo(const LayoutBox& key)
     {
         InfoMap& infoMap = ShapeOutsideInfo::infoMap();
         if (ShapeOutsideInfo* info = infoMap.get(&key))
             return *info;
         InfoMap::AddResult result = infoMap.add(&key, ShapeOutsideInfo::createInfo(key));
         return *result.storedValue->value;
     }
-    static void removeInfo(const RenderBox& key) { infoMap().remove(&key); }
-    static ShapeOutsideInfo* info(const RenderBox& key) { return infoMap().get(&key); }
+    static void removeInfo(const LayoutBox& key) { infoMap().remove(&key); }
+    static ShapeOutsideInfo* info(const LayoutBox& key) { return infoMap().get(&key); }
 
     void markShapeAsDirty() { m_shape.clear(); }
     bool isShapeDirty() { return !m_shape.get(); }
     LayoutSize shapeSize() const { return m_referenceBoxLogicalSize; }
     bool isComputingShape() const { return m_isComputingShape; }
 
     LayoutRect computedShapePhysicalBoundingBox() const;
     FloatPoint shapeToRendererPoint(FloatPoint) const;
     FloatSize shapeToRendererSize(FloatSize) const;
     const Shape& computedShape() const;
 
 protected:
-    ShapeOutsideInfo(const RenderBox& renderer)
+    ShapeOutsideInfo(const LayoutBox& renderer)
         : m_renderer(renderer)
         , m_isComputingShape(false)
     { }
 
 private:
     PassOwnPtr<Shape> createShapeForImage(StyleImage*, float shapeImageThreshold, WritingMode, float margin) const;
 
     LayoutUnit logicalTopOffset() const;
     LayoutUnit logicalLeftOffset() const;
 
-    typedef HashMap<const RenderBox*, OwnPtr<ShapeOutsideInfo> > InfoMap;
+    typedef HashMap<const LayoutBox*, OwnPtr<ShapeOutsideInfo>> InfoMap;
     static InfoMap& infoMap()
     {
         DEFINE_STATIC_LOCAL(InfoMap, staticInfoMap, ());
         return staticInfoMap;
     }
 
-    const RenderBox& m_renderer;
+    const LayoutBox& m_renderer;
     mutable OwnPtr<Shape> m_shape;
     LayoutSize m_referenceBoxLogicalSize;
     ShapeOutsideDeltas m_shapeOutsideDeltas;
     mutable bool m_isComputingShape;
 };
 
 }
 #endif