[chromium-libs-media-freeworld: 3/8] try different hack

commit 97f98971c79e08594b438c3baa3229fbacdab2cf Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Fri Aug 11 10:26:58 2017 -0400 try different hack chromium-60.0.3112.90-init-list-hack.patch | 31 ++++++++++++------------------ 1 file changed, 12 insertions(+), 19 deletions(-) --- diff --git a/chromium-60.0.3112.90-init-list-hack.patch b/chromium-60.0.3112.90-init-list-hack.patch index 6cd91d6..1403335 100644 --- a/chromium-60.0.3112.90-init-list-hack.patch +++ b/chromium-60.0.3112.90-init-list-hack.patch @@ -1,34 +1,27 @@ 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-09 14:46:07.375213058 -0400 -@@ -382,7 +382,7 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: ++++ 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 += +- child_bfc_offset.inline_offset += - {border_and_padding_.inline_start + curr_child_margins_.inline_start}; -+ {{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 -@@ -396,8 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: +@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: + // Should collapse margins if our child is a legacy block. if (IsLegacyBlock(*child)) { - curr_bfc_offset_ += +- curr_bfc_offset_ += - {border_and_padding_.inline_start + curr_child_margins_.inline_start, - curr_margin_strut_.Sum()}; -+ {{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_margin_strut_.Sum()}; ++ curr_bfc_offset_ += sum_inline_starts2; MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_, &container_builder_); PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_, -@@ -526,8 +526,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: - margin_strut.Append(curr_child_margins_.block_end); - - curr_bfc_offset_ += -- {border_and_padding_.inline_start + curr_child_margins_.inline_start, -- margin_strut.Sum()}; -+ {{border_and_padding_.inline_start + curr_child_margins_.inline_start, -+ margin_strut.Sum()}}; - AdjustToClearance(space.ClearanceOffset(), &curr_bfc_offset_); - PositionPendingFloatsFromOffset( - curr_bfc_offset_.block_offset, curr_bfc_offset_.block_offset,