| Index: Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| diff --git a/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| index fb0cfaf501405dc27008db8d346776b9395cbfb0..7a110df8b54bcaac27aa3d9957b7f95ab8817f2a 100644
|
| --- a/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| +++ b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| @@ -148,9 +148,9 @@ const Shape& ShapeOutsideInfo::computedShape() const
|
|
|
| TemporaryChange<bool> isInComputingShape(m_isComputingShape, true);
|
|
|
| - const LayoutStyle& style = *m_renderer.style();
|
| + const ComputedStyle& style = *m_renderer.style();
|
| ASSERT(m_renderer.containingBlock());
|
| - const LayoutStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
|
| + const ComputedStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
|
|
|
| WritingMode writingMode = containingBlockStyle.writingMode();
|
| LayoutUnit maximumValue = m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit();
|
| @@ -220,7 +220,7 @@ LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
|
| return LayoutUnit();
|
| }
|
|
|
| -inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
|
| +inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer, const ComputedStyle* style)
|
| {
|
| if (style->isHorizontalWritingMode()) {
|
| if (style->isLeftToRightDirection())
|
| @@ -234,7 +234,7 @@ inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer,
|
| return renderer.borderBottom();
|
| }
|
|
|
| -inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
|
| +inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& renderer, const ComputedStyle* style)
|
| {
|
| if (style->isHorizontalWritingMode()) {
|
| if (style->isLeftToRightDirection())
|
|
|