[layoutng] Add border and padding when setting the override size

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

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 7590215d8df52d17a581ad4fde6f9947cd1de593..cae190747cc9d0599fe6ae29d473a9dcced13a91 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
@@ -71,12 +71,17 @@ NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
     container_logical_height =
         box.containingBlock()->availableLogicalHeightForPercentageComputation();
   }
+  // When we have an override size, the container_logical_{width,height} will be
+  // used as the final size of the box, so it has to include border and
+  // padding.
   if (box.hasOverrideLogicalContentWidth()) {
-    container_logical_width = box.overrideLogicalContentWidth();
+    container_logical_width =
+        box.borderAndPaddingLogicalWidth() + box.overrideLogicalContentWidth();
     fixed_inline = true;
   }
   if (box.hasOverrideLogicalContentHeight()) {
-    container_logical_width = box.overrideLogicalContentHeight();
+    container_logical_height = box.borderAndPaddingLogicalHeight() +
+                               box.overrideLogicalContentHeight();
     fixed_block = true;
   }