Blob Blame History Raw
diff -up chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
--- chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix	2017-08-09 14:45:17.619172987 -0400
+++ chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc	2017-08-11 10:24:10.635245642 -0400
@@ -381,8 +381,9 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
   }
 
   NGLogicalOffset child_bfc_offset = curr_bfc_offset_;
-  child_bfc_offset.inline_offset +=
-      {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+  LayoutUnit sum_inline_starts = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+
+  child_bfc_offset.inline_offset += sum_inline_starts;
 
   // Append the current margin strut with child's block start margin.
   // Non empty border/padding, and new FC use cases are handled inside of the
@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
 
   // Should collapse margins if our child is a legacy block.
   if (IsLegacyBlock(*child)) {
-    curr_bfc_offset_ +=
-        {border_and_padding_.inline_start + curr_child_margins_.inline_start,
-         curr_margin_strut_.Sum()};
+    LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+    curr_bfc_offset_ += {sum_inline_starts2, curr_margin_strut_.Sum()};
     MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
                                  &container_builder_);
     PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,