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

Unified Diff: Source/core/rendering/shapes/ShapeInsideInfo.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/ShapeInfo.cpp ('k') | Source/core/rendering/shapes/ShapeInsideInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/shapes/ShapeInsideInfo.h
diff --git a/Source/core/rendering/shapes/ShapeInsideInfo.h b/Source/core/rendering/shapes/ShapeInsideInfo.h
index 9b55603ef27f8983de598a53f6f14e7c7710f98a..384638727ed0e55a041b59d2ce275b0864b3067e 100644
--- a/Source/core/rendering/shapes/ShapeInsideInfo.h
+++ b/Source/core/rendering/shapes/ShapeInsideInfo.h
@@ -62,9 +62,8 @@ typedef Vector<LineSegmentRange> SegmentRangeList;
class ShapeInsideInfo FINAL : public ShapeInfo<RenderBlock> {
public:
- static PassOwnPtr<ShapeInsideInfo> createInfo(const RenderBlock* renderer) { return adoptPtr(new ShapeInsideInfo(renderer)); }
-
- static bool isEnabledFor(const RenderBlock* renderer);
+ static PassOwnPtr<ShapeInsideInfo> createInfo(const RenderBlock& renderer) { return adoptPtr(new ShapeInsideInfo(renderer)); }
+ static bool isEnabledFor(const RenderBlock& renderer);
bool updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit lineHeight);
bool updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight);
@@ -96,7 +95,7 @@ public:
virtual bool lineOverlapsShapeBounds() const OVERRIDE
{
- return computedShape()->lineOverlapsShapePaddingBounds(m_referenceBoxLineTop, m_lineHeight);
+ return computedShape().lineOverlapsShapePaddingBounds(m_referenceBoxLineTop, m_lineHeight);
}
protected:
@@ -106,15 +105,15 @@ protected:
return ContentBox;
return shapeValue()->layoutBox();
}
- virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapePaddingLogicalBoundingBox(); }
+ virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapePaddingLogicalBoundingBox(); }
virtual ShapeValue* shapeValue() const OVERRIDE;
virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const OVERRIDE
{
- return computedShape()->getIncludedIntervals(lineTop, lineHeight, segments);
+ return computedShape().getIncludedIntervals(lineTop, lineHeight, segments);
}
private:
- ShapeInsideInfo(const RenderBlock* renderer)
+ ShapeInsideInfo(const RenderBlock& renderer)
: ShapeInfo<RenderBlock> (renderer)
, m_needsLayout(false)
{ }
« no previous file with comments | « Source/core/rendering/shapes/ShapeInfo.cpp ('k') | Source/core/rendering/shapes/ShapeInsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698