|
 |
682675b |
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
|
|
|
682675b |
--- 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
|
|
|
97f9897 |
+++ 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
|
|
|
97f9897 |
@@ -381,8 +381,9 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
|
|
|
97f9897 |
}
|
|
|
682675b |
|
|
|
682675b |
NGLogicalOffset child_bfc_offset = curr_bfc_offset_;
|
|
|
97f9897 |
- child_bfc_offset.inline_offset +=
|
|
|
682675b |
- {border_and_padding_.inline_start + curr_child_margins_.inline_start};
|
|
|
97f9897 |
+ LayoutUnit sum_inline_starts = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
|
|
|
97f9897 |
+
|
|
|
97f9897 |
+ child_bfc_offset.inline_offset += sum_inline_starts;
|
|
|
682675b |
|
|
|
682675b |
// Append the current margin strut with child's block start margin.
|
|
|
682675b |
// Non empty border/padding, and new FC use cases are handled inside of the
|
|
|
97f9897 |
@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
|
|
|
97f9897 |
|
|
|
682675b |
// Should collapse margins if our child is a legacy block.
|
|
|
682675b |
if (IsLegacyBlock(*child)) {
|
|
|
97f9897 |
- curr_bfc_offset_ +=
|
|
|
682675b |
- {border_and_padding_.inline_start + curr_child_margins_.inline_start,
|
|
|
682675b |
- curr_margin_strut_.Sum()};
|
|
|
268e0a6 |
+ LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
|
|
|
268e0a6 |
+ curr_bfc_offset_ += {sum_inline_starts2, curr_margin_strut_.Sum()};
|
|
|
682675b |
MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
|
|
|
682675b |
&container_builder_);
|
|
|
682675b |
PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,
|