Chromium Code Reviews| Index: Source/core/rendering/RenderBlock.h |
| diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h |
| index d63945d13d389cd1c662c785cd7f6668399990f1..30ea36b6cd92d688f2d345a199d4d4f56ce5cad6 100644 |
| --- a/Source/core/rendering/RenderBlock.h |
| +++ b/Source/core/rendering/RenderBlock.h |
| @@ -227,6 +227,7 @@ public: |
| // Accessors for logical width/height and margins in the containing block's block-flow direction. |
| LayoutUnit logicalWidthForChild(const RenderBox* child) const { return isHorizontalWritingMode() ? child->width() : child->height(); } |
| LayoutUnit logicalHeightForChild(const RenderBox* child) const { return isHorizontalWritingMode() ? child->height() : child->width(); } |
| + LayoutSize logicalSizeForChild(const RenderBox* child) const { return isHorizontalWritingMode() ? child->size() : child->size().transposedSize(); } |
|
adamk
2014/03/04 19:45:05
This change seems out of place in this patch, as i
|
| LayoutUnit logicalTopForChild(const RenderBox* child) const { return isHorizontalWritingMode() ? child->y() : child->x(); } |
| LayoutUnit marginBeforeForChild(const RenderBoxModelObject* child) const { return child->marginBefore(style()); } |
| LayoutUnit marginAfterForChild(const RenderBoxModelObject* child) const { return child->marginAfter(style()); } |
| @@ -254,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) |
| { |