Chromium Code Reviews| Index: Source/core/rendering/shapes/ShapeOutsideInfo.h |
| diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.h b/Source/core/rendering/shapes/ShapeOutsideInfo.h |
| index 9e0dfdc2e380e91ac9ed488380cad68859087e6b..ab58d738f1becf688d08a6e008523294d56ccaf4 100644 |
| --- a/Source/core/rendering/shapes/ShapeOutsideInfo.h |
| +++ b/Source/core/rendering/shapes/ShapeOutsideInfo.h |
| @@ -41,18 +41,18 @@ class FloatingObject; |
| class ShapeOutsideInfo FINAL : public ShapeInfo<RenderBox>, public MappedInfo<RenderBox, ShapeOutsideInfo> { |
| public: |
| + |
|
rwlbuis
2014/03/04 14:21:13
I wouldn't do style changes in this patch.
|
| LayoutUnit leftMarginBoxDelta() const { return m_leftMarginBoxDelta; } |
| LayoutUnit rightMarginBoxDelta() const { return m_rightMarginBoxDelta; } |
| bool lineOverlapsShape() const { return m_lineOverlapsShape; } |
| - void updateDeltasForContainingBlockLine(const RenderBlockFlow*, const FloatingObject*, LayoutUnit lineTop, LayoutUnit lineHeight); |
| - |
| - static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox* renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); } |
| - static bool isEnabledFor(const RenderBox*); |
| + static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox& renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); } |
| + static bool isEnabledFor(const RenderBox&); |
| + void updateDeltasForContainingBlockLine(const RenderBlockFlow&, const FloatingObject&, LayoutUnit lineTop, LayoutUnit lineHeight); |
| virtual bool lineOverlapsShapeBounds() const OVERRIDE |
| { |
| - return computedShape()->lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight); |
| + return computedShape().lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight); |
| } |
| protected: |
| @@ -62,15 +62,15 @@ protected: |
| return MarginBox; |
| return shapeValue()->layoutBox(); |
| } |
| - virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapeMarginLogicalBoundingBox(); } |
| + virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapeMarginLogicalBoundingBox(); } |
| virtual ShapeValue* shapeValue() const OVERRIDE; |
| virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const OVERRIDE |
| { |
| - return computedShape()->getExcludedIntervals(lineTop, lineHeight, segments); |
| + return computedShape().getExcludedIntervals(lineTop, lineHeight, segments); |
| } |
| private: |
| - ShapeOutsideInfo(const RenderBox* renderer) |
| + ShapeOutsideInfo(const RenderBox& renderer) |
| : ShapeInfo<RenderBox>(renderer) |
| , m_lineOverlapsShape(false) |
| { } |