Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc |
index f0f49438d0c78f40185c645117b6466991a574ed..f96e122561624e174cff25b5033150115c200d3e 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc |
@@ -9,10 +9,8 @@ |
namespace blink { |
-NGConstraintSpace::NGConstraintSpace(LayoutUnit inlineContainerSize, |
- LayoutUnit blockContainerSize) { |
- m_inlineContainerSize = inlineContainerSize; |
- m_blockContainerSize = blockContainerSize; |
+NGConstraintSpace::NGConstraintSpace(NGLogicalSize container_size) { |
+ container_size_ = container_size; |
m_inlineTriggersScrollbar = 0; |
m_blockTriggersScrollbar = 0; |
m_fixedInlineSize = 0; |
@@ -36,7 +34,10 @@ NGConstraintSpace NGConstraintSpace::fromLayoutObject(const LayoutBox& child) { |
containerLogicalWidth = child.overrideLogicalContentHeight(); |
fixedBlock = true; |
} |
- NGConstraintSpace space(containerLogicalWidth, containerLogicalHeight); |
+ NGLogicalSize size; |
+ size.inlineSize = containerLogicalWidth; |
+ size.blockSize = containerLogicalHeight; |
+ NGConstraintSpace space(size); |
space.setOverflowTriggersScrollbar( |
child.styleRef().overflowInlineDirection() == OverflowAuto, |
child.styleRef().overflowBlockDirection() == OverflowAuto); |