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

Unified Diff: Source/core/rendering/RenderBlock.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/LayoutState.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.h
diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
index 38a6d678b1c32b83a90487a285a13a61b3dbe087..30ea36b6cd92d688f2d345a199d4d4f56ce5cad6 100644
--- a/Source/core/rendering/RenderBlock.h
+++ b/Source/core/rendering/RenderBlock.h
@@ -255,15 +255,15 @@ 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)
{
« no previous file with comments | « Source/core/rendering/LayoutState.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698