| Index: Source/core/rendering/shapes/RasterShape.h
|
| diff --git a/Source/core/rendering/shapes/RasterShape.h b/Source/core/rendering/shapes/RasterShape.h
|
| index ed650a8044a370db8f8e908526a0a20c366ca97f..a5eb84570d7d15bde1d134ba293a6eee681c09b1 100644
|
| --- a/Source/core/rendering/shapes/RasterShape.h
|
| +++ b/Source/core/rendering/shapes/RasterShape.h
|
| @@ -50,9 +50,8 @@ public:
|
| bool isEmpty() const { return m_bounds.isEmpty(); }
|
| void appendInterval(int y, int x1, int x2);
|
|
|
| - void getIncludedIntervals(int y1, int y2, IntShapeIntervals& result) const;
|
| void getExcludedIntervals(int y1, int y2, IntShapeIntervals& result) const;
|
| - bool firstIncludedIntervalY(int minY, const IntSize& minSize, LayoutUnit& result) const;
|
| +
|
| PassOwnPtr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
|
|
|
| void buildBoundsPath(Path&) const;
|
| @@ -99,15 +98,11 @@ public:
|
| }
|
|
|
| virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(marginIntervals().bounds()); }
|
| - virtual LayoutRect shapePaddingLogicalBoundingBox() const OVERRIDE { return static_cast<LayoutRect>(paddingIntervals().bounds()); }
|
| virtual bool isEmpty() const OVERRIDE { return m_intervals->isEmpty(); }
|
| virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const OVERRIDE;
|
| - virtual void getIncludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList&) const OVERRIDE;
|
| - virtual bool firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop, const FloatSize& minLogicalIntervalSize, LayoutUnit&) const OVERRIDE;
|
|
|
| private:
|
| const RasterShapeIntervals& marginIntervals() const;
|
| - const RasterShapeIntervals& paddingIntervals() const;
|
|
|
| OwnPtr<RasterShapeIntervals> m_intervals;
|
| mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;
|
|
|