diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc index 21ab11cf7b5..5328304e619 100644 --- a/chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc +++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc @@ -5,7 +5,6 @@ #include "third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.h" #include <algorithm> -#include "third_party/blink/renderer/core/layout/ng/inline/ng_baseline.h" #include "third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.h" #include "third_party/blink/renderer/core/layout/ng/ng_box_fragment.h" #include "third_party/blink/renderer/core/layout/ng/ng_constraint_space_builder.h" @@ -81,13 +80,13 @@ scoped_refptr<const NGLayoutResult> NGPageLayoutAlgorithm::Layout() { return container_builder_.ToBoxFragment(); } -base::Optional<MinMaxSize> NGPageLayoutAlgorithm::ComputeMinMaxSize( - const MinMaxSizeInput& input) const { +base::Optional<MinMaxSizes> NGPageLayoutAlgorithm::ComputeMinMaxSizes( + const MinMaxSizesInput& input) const { NGFragmentGeometry fragment_geometry = CalculateInitialMinMaxFragmentGeometry(ConstraintSpace(), Node()); NGBlockLayoutAlgorithm algorithm( {Node(), fragment_geometry, ConstraintSpace()}); - return algorithm.ComputeMinMaxSize(input); + return algorithm.ComputeMinMaxSizes(input); } NGConstraintSpace NGPageLayoutAlgorithm::CreateConstraintSpaceForPages( @@ -97,9 +96,6 @@ NGConstraintSpace NGPageLayoutAlgorithm::CreateConstraintSpaceForPages( space_builder.SetAvailableSize(page_size); space_builder.SetPercentageResolutionSize(page_size); - if (NGBaseline::ShouldPropagateBaselines(Node())) - space_builder.AddBaselineRequests(ConstraintSpace().BaselineRequests()); - // TODO(mstensho): Handle auto block size. space_builder.SetFragmentationType(kFragmentPage); space_builder.SetFragmentainerBlockSize(page_size.block_size); |