| Index: sky/engine/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| index ba63119c086e928bda5312e34dcff596418d6e46..d68c9c6472193ee6f13fecfd6c71c682b4d91b6c 100644
|
| --- a/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| +++ b/sky/engine/core/rendering/RenderBlockFlow.cpp
|
| @@ -394,8 +394,7 @@ void RenderBlockFlow::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo,
|
| if (childRenderBlockFlow) {
|
| if (markDescendantsWithFloats)
|
| childRenderBlockFlow->markAllDescendantsWithFloatsForLayout();
|
| - if (!child->isWritingModeRoot())
|
| - previousFloatLogicalBottom = std::max(previousFloatLogicalBottom, oldLogicalTop + childRenderBlockFlow->lowestFloatLogicalBottom());
|
| + previousFloatLogicalBottom = std::max(previousFloatLogicalBottom, oldLogicalTop + childRenderBlockFlow->lowestFloatLogicalBottom());
|
| }
|
|
|
| SubtreeLayoutScope layoutScope(*child);
|
| @@ -864,7 +863,7 @@ void RenderBlockFlow::marginBeforeEstimateForChild(RenderBox* child, LayoutUnit&
|
| return;
|
|
|
| RenderBlockFlow* childBlockFlow = toRenderBlockFlow(child);
|
| - if (childBlockFlow->childrenInline() || childBlockFlow->isWritingModeRoot())
|
| + if (childBlockFlow->childrenInline())
|
| return;
|
|
|
| MarginInfo childMarginInfo(childBlockFlow, childBlockFlow->borderBefore() + childBlockFlow->paddingBefore(), childBlockFlow->borderAfter() + childBlockFlow->paddingAfter());
|
| @@ -1063,18 +1062,14 @@ bool RenderBlockFlow::mustSeparateMarginBeforeForChild(const RenderBox* child) c
|
| {
|
| ASSERT(!child->selfNeedsLayout());
|
| const RenderStyle* childStyle = child->style();
|
| - if (!child->isWritingModeRoot())
|
| - return childStyle->marginBeforeCollapse() == MSEPARATE;
|
| - return childStyle->marginAfterCollapse() == MSEPARATE;
|
| + return childStyle->marginBeforeCollapse() == MSEPARATE;
|
| }
|
|
|
| bool RenderBlockFlow::mustSeparateMarginAfterForChild(const RenderBox* child) const
|
| {
|
| ASSERT(!child->selfNeedsLayout());
|
| const RenderStyle* childStyle = child->style();
|
| - if (!child->isWritingModeRoot())
|
| - return childStyle->marginAfterCollapse() == MSEPARATE;
|
| - return childStyle->marginBeforeCollapse() == MSEPARATE;
|
| + return childStyle->marginAfterCollapse() == MSEPARATE;
|
| }
|
|
|
| void RenderBlockFlow::addOverflowFromFloats()
|
|
|