| Index: Source/core/rendering/shapes/ShapeOutsideInfo.h
|
| diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.h b/Source/core/rendering/shapes/ShapeOutsideInfo.h
|
| index 2ff53d987262368b09d3cf25e24639cf521820b4..522db74a420fad2ce5b1b59e3c98d5728f1ebc18 100644
|
| --- a/Source/core/rendering/shapes/ShapeOutsideInfo.h
|
| +++ b/Source/core/rendering/shapes/ShapeOutsideInfo.h
|
| @@ -89,14 +89,18 @@ public:
|
| bool isShapeDirty() { return !m_shape.get(); }
|
| LayoutSize shapeSize() const { return m_referenceBoxLogicalSize; }
|
|
|
| -private:
|
| - ShapeOutsideInfo(const RenderBox& renderer)
|
| + LayoutRect computedShapePhysicalBoundingBox() const;
|
| + FloatPoint shapeToRendererPoint(FloatPoint) const;
|
| + FloatSize shapeToRendererSize(FloatSize) const;
|
| +
|
| + const Shape& computedShape() const;
|
| +protected:
|
| + explicit ShapeOutsideInfo(const RenderBox& renderer)
|
| : m_renderer(renderer)
|
| , m_lineOverlapsShape(false)
|
| { }
|
|
|
| - const Shape& computedShape() const;
|
| -
|
| +private:
|
| LayoutUnit logicalTopOffset() const;
|
| LayoutUnit logicalLeftOffset() const;
|
|
|
| @@ -111,8 +115,10 @@ private:
|
| LayoutUnit m_lineHeight;
|
|
|
| const RenderBox& m_renderer;
|
| +
|
| mutable OwnPtr<Shape> m_shape;
|
| LayoutSize m_referenceBoxLogicalSize;
|
| +
|
| LayoutUnit m_leftMarginBoxDelta;
|
| LayoutUnit m_rightMarginBoxDelta;
|
| LayoutUnit m_borderBoxLineTop;
|
|
|