Commit 08f0ca3d authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot

[LayoutNG] Remove unused param from PositionFloat{,s}.

There should be no behaviour change.

Bug: 635619
Change-Id: I0e885c53a27c07a85e64371f3e6edfcbd17d01f8
Reviewed-on: https://chromium-review.googlesource.com/c/1352442Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611373}
parent dac93b4b
...@@ -900,9 +900,8 @@ void NGInlineLayoutAlgorithm::PositionPendingFloats( ...@@ -900,9 +900,8 @@ void NGInlineLayoutAlgorithm::PositionPendingFloats(
PositionFloats(ConstraintSpace().AvailableSize(), PositionFloats(ConstraintSpace().AvailableSize(),
ConstraintSpace().PercentageResolutionSize(), ConstraintSpace().PercentageResolutionSize(),
ConstraintSpace().ReplacedPercentageResolutionSize(), ConstraintSpace().ReplacedPercentageResolutionSize(),
origin_bfc_offset, bfc_block_offset, unpositioned_floats_, origin_bfc_offset, unpositioned_floats_, ConstraintSpace(),
ConstraintSpace(), Style(), exclusion_space, Style(), exclusion_space, &positioned_floats);
&positioned_floats);
positioned_floats_.AppendVector(positioned_floats); positioned_floats_.AppendVector(positioned_floats);
unpositioned_floats_.Shrink(0); unpositioned_floats_.Shrink(0);
......
...@@ -919,8 +919,8 @@ void NGLineBreaker::HandleFloat(const NGInlineItem& item) { ...@@ -919,8 +919,8 @@ void NGLineBreaker::HandleFloat(const NGInlineItem& item) {
constraint_space_.PercentageResolutionSize(), constraint_space_.PercentageResolutionSize(),
constraint_space_.ReplacedPercentageResolutionSize(), constraint_space_.ReplacedPercentageResolutionSize(),
{constraint_space_.BfcOffset().line_offset, bfc_block_offset}, {constraint_space_.BfcOffset().line_offset, bfc_block_offset},
constraint_space_.BfcOffset().block_offset, &unpositioned_float, &unpositioned_float, constraint_space_, node_.Style(),
constraint_space_, node_.Style(), exclusion_space_); exclusion_space_);
positioned_floats_->push_back(positioned_float); positioned_floats_->push_back(positioned_float);
NGLayoutOpportunity opportunity = exclusion_space_->FindLayoutOpportunity( NGLayoutOpportunity opportunity = exclusion_space_->FindLayoutOpportunity(
......
...@@ -2228,19 +2228,13 @@ void NGBlockLayoutAlgorithm::PositionPendingFloats( ...@@ -2228,19 +2228,13 @@ void NGBlockLayoutAlgorithm::PositionPendingFloats(
border_scrollbar_padding_.LineLeft(ConstraintSpace().Direction()), border_scrollbar_padding_.LineLeft(ConstraintSpace().Direction()),
origin_block_offset}; origin_block_offset};
LayoutUnit bfc_block_offset =
container_builder_.BfcBlockOffset()
? container_builder_.BfcBlockOffset().value()
: ConstraintSpace().FloatsBfcBlockOffset().value();
NGPositionedFloatVector positioned_floats; NGPositionedFloatVector positioned_floats;
PositionFloats(child_available_size_, child_percentage_size_, PositionFloats(child_available_size_, child_percentage_size_,
replaced_child_percentage_size_, origin_bfc_offset, replaced_child_percentage_size_, origin_bfc_offset,
bfc_block_offset, unpositioned_floats_, ConstraintSpace(), unpositioned_floats_, ConstraintSpace(), Style(),
Style(), &exclusion_space_, &positioned_floats); &exclusion_space_, &positioned_floats);
AddPositionedFloats(positioned_floats); AddPositionedFloats(positioned_floats);
unpositioned_floats_.Shrink(0); unpositioned_floats_.Shrink(0);
} }
......
...@@ -227,7 +227,6 @@ NGPositionedFloat PositionFloat( ...@@ -227,7 +227,6 @@ NGPositionedFloat PositionFloat(
const NGLogicalSize& float_percentage_size, const NGLogicalSize& float_percentage_size,
const NGLogicalSize& float_replaced_percentage_size, const NGLogicalSize& float_replaced_percentage_size,
const NGBfcOffset& origin_bfc_offset, const NGBfcOffset& origin_bfc_offset,
LayoutUnit parent_bfc_block_offset,
NGUnpositionedFloat* unpositioned_float, NGUnpositionedFloat* unpositioned_float,
const NGConstraintSpace& parent_space, const NGConstraintSpace& parent_space,
const ComputedStyle& parent_style, const ComputedStyle& parent_style,
...@@ -317,7 +316,6 @@ void PositionFloats(const NGLogicalSize& float_available_size, ...@@ -317,7 +316,6 @@ void PositionFloats(const NGLogicalSize& float_available_size,
const NGLogicalSize& float_percentage_size, const NGLogicalSize& float_percentage_size,
const NGLogicalSize& float_replaced_percentage_size, const NGLogicalSize& float_replaced_percentage_size,
const NGBfcOffset& origin_bfc_offset, const NGBfcOffset& origin_bfc_offset,
LayoutUnit parent_bfc_block_offset,
NGUnpositionedFloatVector& unpositioned_floats, NGUnpositionedFloatVector& unpositioned_floats,
const NGConstraintSpace& parent_space, const NGConstraintSpace& parent_space,
const ComputedStyle& parent_style, const ComputedStyle& parent_style,
...@@ -327,11 +325,10 @@ void PositionFloats(const NGLogicalSize& float_available_size, ...@@ -327,11 +325,10 @@ void PositionFloats(const NGLogicalSize& float_available_size,
unpositioned_floats.size()); unpositioned_floats.size());
for (NGUnpositionedFloat& unpositioned_float : unpositioned_floats) { for (NGUnpositionedFloat& unpositioned_float : unpositioned_floats) {
positioned_floats->push_back( positioned_floats->push_back(PositionFloat(
PositionFloat(float_available_size, float_percentage_size, float_available_size, float_percentage_size,
float_replaced_percentage_size, origin_bfc_offset, float_replaced_percentage_size, origin_bfc_offset, &unpositioned_float,
parent_bfc_block_offset, &unpositioned_float, parent_space, parent_style, exclusion_space));
parent_space, parent_style, exclusion_space));
} }
} }
......
...@@ -48,7 +48,6 @@ PositionFloat(const NGLogicalSize& float_available_size, ...@@ -48,7 +48,6 @@ PositionFloat(const NGLogicalSize& float_available_size,
const NGLogicalSize& float_percentage_size, const NGLogicalSize& float_percentage_size,
const NGLogicalSize& float_replaced_percentage_size, const NGLogicalSize& float_replaced_percentage_size,
const NGBfcOffset& origin_bfc_offset, const NGBfcOffset& origin_bfc_offset,
LayoutUnit parent_bfc_block_offset,
NGUnpositionedFloat*, NGUnpositionedFloat*,
const NGConstraintSpace& parent_space, const NGConstraintSpace& parent_space,
const ComputedStyle& parent_style, const ComputedStyle& parent_style,
...@@ -61,7 +60,6 @@ CORE_EXPORT void PositionFloats( ...@@ -61,7 +60,6 @@ CORE_EXPORT void PositionFloats(
const NGLogicalSize& float_percentage_size, const NGLogicalSize& float_percentage_size,
const NGLogicalSize& float_replaced_percentage_size, const NGLogicalSize& float_replaced_percentage_size,
const NGBfcOffset& origin_bfc_offset, const NGBfcOffset& origin_bfc_offset,
LayoutUnit container_block_offset,
NGUnpositionedFloatVector& unpositioned_floats, NGUnpositionedFloatVector& unpositioned_floats,
const NGConstraintSpace& parent_space, const NGConstraintSpace& parent_space,
const ComputedStyle& parent_style, const ComputedStyle& parent_style,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment