Index: Source/core/rendering/RenderBlock.h |
diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h |
index d63945d13d389cd1c662c785cd7f6668399990f1..32e41bb661b62f67aa4e802c90687d2ac137e207 100644 |
--- a/Source/core/rendering/RenderBlock.h |
+++ b/Source/core/rendering/RenderBlock.h |
@@ -254,20 +254,21 @@ public: |
void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0) const; |
#endif |
- ShapeInsideInfo* ensureShapeInsideInfo() |
+ ShapeInsideInfo& ensureShapeInsideInfo() |
{ |
if (!m_rareData || !m_rareData->m_shapeInsideInfo) |
- setShapeInsideInfo(ShapeInsideInfo::createInfo(this)); |
- return m_rareData->m_shapeInsideInfo.get(); |
+ setShapeInsideInfo(ShapeInsideInfo::createInfo(*this)); |
+ return *m_rareData->m_shapeInsideInfo; |
} |
ShapeInsideInfo* shapeInsideInfo() const |
{ |
- return m_rareData && m_rareData->m_shapeInsideInfo && ShapeInsideInfo::isEnabledFor(this) ? m_rareData->m_shapeInsideInfo.get() : 0; |
+ return m_rareData && m_rareData->m_shapeInsideInfo && ShapeInsideInfo::isEnabledFor(*this) ? m_rareData->m_shapeInsideInfo.get() : 0; |
} |
void setShapeInsideInfo(PassOwnPtr<ShapeInsideInfo> value) |
{ |
if (!m_rareData) |
m_rareData = adoptPtr(new RenderBlockRareData()); |
+ |
rwlbuis
2014/03/04 14:21:13
I wouldn't do style changes in this patch.
|
m_rareData->m_shapeInsideInfo = value; |
} |
ShapeInsideInfo* layoutShapeInsideInfo() const; |