Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1526)

Unified Diff: Source/core/rendering/shapes/ShapeOutsideInfo.h

Issue 178473024: Convert some Shape code to use references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased patch Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/shapes/ShapeInsideInfo.cpp ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/shapes/ShapeOutsideInfo.h
diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.h b/Source/core/rendering/shapes/ShapeOutsideInfo.h
index 99c34a0aa657f619a44ca8939fbd60d298d5a182..7ff8ab4752dae46dac6b4085397ce7a003e1b7b8 100644
--- a/Source/core/rendering/shapes/ShapeOutsideInfo.h
+++ b/Source/core/rendering/shapes/ShapeOutsideInfo.h
@@ -45,14 +45,13 @@ public:
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_referenceBoxLineTop, m_lineHeight);
+ return computedShape().lineOverlapsShapeMarginBounds(m_referenceBoxLineTop, m_lineHeight);
}
protected:
@@ -62,15 +61,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)
{ }
« no previous file with comments | « Source/core/rendering/shapes/ShapeInsideInfo.cpp ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698