[CSS Shapes] Port shape-inside on regions and shape's content overflow from WebKit

Source/core/rendering/shapes/ShapeInfo.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 34 matching lines @@
     BasicShape* shape = (shapeValue && shapeValue->type() == ShapeValue::Shape) ? shapeValue->shape() : 0;
 
     ASSERT(shape);
 
     m_shape = Shape::createShape(shape, LayoutSize(m_shapeLogicalWidth, m_shapeLogicalHeight), m_renderer->style()->writingMode(), m_renderer->style()->shapeMargin(), m_renderer->style()->shapePadding());
     ASSERT(m_shape);
     return m_shape.get();
 }
 
 template<class RenderType, ShapeValue* (RenderStyle::*shapeGetter)() const, void (Shape::*intervalGetter)(LayoutUnit, LayoutUnit, SegmentList&) const>
-LayoutUnit ShapeInfo<RenderType, shapeGetter, intervalGetter>::logicalTopOffset() const
-{
-    LayoutUnit logicalTopOffset = m_renderer->style()->boxSizing() == CONTENT_BOX ? m_renderer->borderBefore() + m_renderer->paddingBefore() : LayoutUnit();
-    // Content in a flow thread is relative to the beginning of the thread, but the shape calculation should be relative to the current region.
-    if (m_renderer->isRenderRegion())
-        logicalTopOffset += toRenderRegion(m_renderer)->logicalTopForFlowThreadContent();
-    return logicalTopOffset;
-}
-
-template<class RenderType, ShapeValue* (RenderStyle::*shapeGetter)() const, void (Shape::*intervalGetter)(LayoutUnit, LayoutUnit, SegmentList&) const>
 bool ShapeInfo<RenderType, shapeGetter, intervalGetter>::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
 {
     ASSERT(lineHeight >= 0);
     m_shapeLineTop = lineTop - logicalTopOffset();
     m_lineHeight = lineHeight;
     m_segments.clear();
 
     if (lineOverlapsShapeBounds())
         (computedShape()->*intervalGetter)(m_shapeLineTop, std::min(m_lineHeight, shapeLogicalBottom() - lineTop), m_segments);
 
     LayoutUnit logicalLeftOffset = this->logicalLeftOffset();
     for (size_t i = 0; i < m_segments.size(); i++) {
         m_segments[i].logicalLeft += logicalLeftOffset;
         m_segments[i].logicalRight += logicalLeftOffset;
     }
 
     return m_segments.size();
 }
 
 template class ShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside, &Shape::getIncludedIntervals>;
 template class ShapeInfo<RenderBox, &RenderStyle::shapeOutside, &Shape::getExcludedIntervals>;
 }