Commit 050fce37 authored by David Grogan's avatar David Grogan Committed by Commit Bot

[FlexNG] Remove redundant IsMultiline method

Sufficient refactoring has been done that FlexLayoutAlgorithm exists at
the time of the call and we can use its method.

Bug: 845235
Change-Id: I1d81924bdaad97ab6d176862ff21c6841b246987
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050738
Auto-Submit: David Grogan <dgrogan@chromium.org>
Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Commit-Queue: David Grogan <dgrogan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740850}
parent 29fc1474
...@@ -1038,7 +1038,7 @@ base::Optional<MinMaxSize> NGFlexLayoutAlgorithm::ComputeMinMaxSize( ...@@ -1038,7 +1038,7 @@ base::Optional<MinMaxSize> NGFlexLayoutAlgorithm::ComputeMinMaxSize(
sizes->max_size = std::max(sizes->max_size, child_min_max_sizes.max_size); sizes->max_size = std::max(sizes->max_size, child_min_max_sizes.max_size);
} else { } else {
sizes->max_size += child_min_max_sizes.max_size; sizes->max_size += child_min_max_sizes.max_size;
if (IsMultiline()) { if (algorithm_->IsMultiline()) {
sizes->min_size = sizes->min_size =
std::max(sizes->min_size, child_min_max_sizes.min_size); std::max(sizes->min_size, child_min_max_sizes.min_size);
} else { } else {
...@@ -1055,8 +1055,4 @@ base::Optional<MinMaxSize> NGFlexLayoutAlgorithm::ComputeMinMaxSize( ...@@ -1055,8 +1055,4 @@ base::Optional<MinMaxSize> NGFlexLayoutAlgorithm::ComputeMinMaxSize(
return sizes; return sizes;
} }
bool NGFlexLayoutAlgorithm::IsMultiline() const {
return Style().FlexWrap() != EFlexWrap::kNowrap;
}
} // namespace blink } // namespace blink
...@@ -72,11 +72,6 @@ class CORE_EXPORT NGFlexLayoutAlgorithm ...@@ -72,11 +72,6 @@ class CORE_EXPORT NGFlexLayoutAlgorithm
LayoutUnit block_offset, LayoutUnit block_offset,
base::Optional<LayoutUnit>* fallback_baseline); base::Optional<LayoutUnit>* fallback_baseline);
// TODO(dgrogan): This is redundant with FlexLayoutAlgorithm.IsMultiline() but
// it's needed before the algorithm is instantiated. Figure out how to
// not reimplement.
bool IsMultiline() const;
const NGBoxStrut border_padding_; const NGBoxStrut border_padding_;
const NGBoxStrut border_scrollbar_padding_; const NGBoxStrut border_scrollbar_padding_;
const bool is_column_; const bool is_column_;
......
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