[LayoutNG] Switch NGConstraintSpace to NGLogicalSize

third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/ng_constraint_space.h"
 
 #include "core/layout/LayoutBox.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
-NGConstraintSpace::NGConstraintSpace(LayoutUnit inlineContainerSize,
-                                     LayoutUnit blockContainerSize) {
-  m_inlineContainerSize = inlineContainerSize;
-  m_blockContainerSize = blockContainerSize;
+NGConstraintSpace::NGConstraintSpace(NGLogicalSize size) {

[cbiesinger, 2016/08/12 17:32:24]

size -> container_size?

+  container_size_ = size;
   m_inlineTriggersScrollbar = 0;
   m_blockTriggersScrollbar = 0;
   m_fixedInlineSize = 0;
   m_fixedBlockSize = 0;
   m_blockFragmentationType = FragmentNone;
 }
 
 NGConstraintSpace NGConstraintSpace::fromLayoutObject(const LayoutBox& child) {
   bool fixedInline = false, fixedBlock = false;
   // XXX for orthogonal writing mode this is not right
   LayoutUnit containerLogicalWidth =
       std::max(LayoutUnit(), child.containingBlockLogicalWidthForContent());
   // XXX Make sure this height is correct
   LayoutUnit containerLogicalHeight =
       child.containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding);
   if (child.hasOverrideLogicalContentWidth()) {
     containerLogicalWidth = child.overrideLogicalContentWidth();
     fixedInline = true;
   }
   if (child.hasOverrideLogicalContentHeight()) {
     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);
   space.setFixedSize(fixedInline, fixedBlock);
   return space;
 }
 
 void NGConstraintSpace::addExclusion(const NGExclusion exclusion,
                                      unsigned options) {}
 
@@ skipping 21 matching lines @@
 
 NGLayoutOpportunityIterator NGConstraintSpace::layoutOpportunities(
     unsigned clear,
     NGExclusionFlowType avoid) const {
   // TODO(eae): Implement.
   NGLayoutOpportunityIterator iterator(this, clear, avoid);
   return iterator;
 }
 
 }  // namespace blink