[LayoutNG] Handle border and padding when sizing a block and when placing its children.

third_party/WebKit/Source/core/layout/ng/ng_length_utils.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_length_utils.h"
 
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/LayoutUnit.h"
 #include "platform/Length.h"
@@ skipping 60 matching lines @@
     LayoutUnit max = resolveInlineLength(constraintSpace, maxLength,
                                          LengthResolveType::MaxSize);
     extent = std::min(extent, max);
   }
 
   LayoutUnit min = resolveInlineLength(constraintSpace, style.logicalMinWidth(),
                                        LengthResolveType::MinSize);
   extent = std::max(extent, min);
 
   if (style.boxSizing() == BoxSizingContentBox) {
-    // TODO(layout-ng): Compute border/padding size and add it
+    extent += computeBorderAndPaddingStart(constraintSpace, style);
+    extent += computeBorderAndPaddingEnd(constraintSpace, style);
   }
 
   return extent;
 }
 
 LayoutUnit computeBlockSizeForFragment(const NGConstraintSpace& constraintSpace,
                                        const ComputedStyle& style,
                                        LayoutUnit contentSize) {
   if (constraintSpace.FixedBlockSize())
     return constraintSpace.ContainerSize().block_size;
@@ skipping 11 matching lines @@
     LayoutUnit max = resolveBlockLength(constraintSpace, maxLength, contentSize,
                                         LengthResolveType::MaxSize);
     extent = std::min(extent, max);
   }
 
   LayoutUnit min = resolveBlockLength(constraintSpace, style.logicalMinHeight(),
                                       contentSize, LengthResolveType::MinSize);
   extent = std::max(extent, min);
 
   if (style.boxSizing() == BoxSizingContentBox) {
-    // TODO(layout-ng): Compute border/padding size and add it
+    extent += computeBorderAndPaddingBefore(constraintSpace, style);
+    extent += computeBorderAndPaddingAfter(constraintSpace, style);
   }
 
   return extent;
 }
 
+LayoutUnit computeBorderAndPaddingBefore(

[ikilpatrick, 2016/09/09 16:33:06]

small nit; trying to be consistent with css and only use the terminology in
writing modes spec.

i.e. s/Before/BlockStart , Start/InlineStart, etc. :)

+    const NGConstraintSpace& constraintSpace,
+    const ComputedStyle& style) {
+  // Percentages on block-direction padding are resolved against the containing
+  // block *inline size* - hence the call to resolveInlineLength().
+  LayoutUnit padding =
+      resolveInlineLength(constraintSpace, style.paddingBefore(),
+                          LengthResolveType::MarginBorderPaddingSize);
+  return padding + LayoutUnit(style.borderBeforeWidth());
+}
+
+LayoutUnit computeBorderAndPaddingAfter(
+    const NGConstraintSpace& constraintSpace,
+    const ComputedStyle& style) {
+  // Percentages on block-direction padding are resolved against the containing
+  // block *inline size* - hence the call to resolveInlineLength().
+  LayoutUnit padding =
+      resolveInlineLength(constraintSpace, style.paddingAfter(),
+                          LengthResolveType::MarginBorderPaddingSize);
+  return padding + LayoutUnit(style.borderAfterWidth());
+}
+
+LayoutUnit computeBorderAndPaddingStart(
+    const NGConstraintSpace& constraintSpace,
+    const ComputedStyle& style) {
+  LayoutUnit padding =
+      resolveInlineLength(constraintSpace, style.paddingStart(),
+                          LengthResolveType::MarginBorderPaddingSize);
+  return padding + LayoutUnit(style.borderStartWidth());
+}
+
+LayoutUnit computeBorderAndPaddingEnd(const NGConstraintSpace& constraintSpace,
+                                      const ComputedStyle& style) {
+  LayoutUnit padding =
+      resolveInlineLength(constraintSpace, style.paddingEnd(),
+                          LengthResolveType::MarginBorderPaddingSize);
+  return padding + LayoutUnit(style.borderEndWidth());
+}
+
 NGBoxStrut computeMargins(const NGConstraintSpace& constraintSpace,
                           const ComputedStyle& style) {
   // Margins always get computed relative to the inline size:
   // https://www.w3.org/TR/CSS2/box.html#value-def-margin-width
   NGBoxStrut margins;
   margins.inline_start =
       resolveInlineLength(constraintSpace, style.marginStart(),
                           LengthResolveType::MarginBorderPaddingSize);
   margins.inline_end =
       resolveInlineLength(constraintSpace, style.marginEnd(),
@@ skipping 30 matching lines @@
   padding.block_start =
       resolveInlineLength(constraintSpace, style.paddingBefore(),
                           LengthResolveType::MarginBorderPaddingSize);
   padding.block_end =
       resolveInlineLength(constraintSpace, style.paddingAfter(),
                           LengthResolveType::MarginBorderPaddingSize);
   return padding;
 }
 
 }  // namespace blink