diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-28 12:34:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-28 12:34:48 -0500 |
commit | 1fa0863f28edb0b1ea2b50146e8da77ec0e4a85d (patch) | |
tree | a05d28e716211e75f38dfbab3bded924f918ba23 | |
parent | 134d1f9f317ab5e1aa655c651cc2c88418f55379 (diff) | |
parent | c20c4688147927124160c61befc1362d9e7612e5 (diff) | |
download | servo-1fa0863f28edb0b1ea2b50146e8da77ec0e4a85d.tar.gz servo-1fa0863f28edb0b1ea2b50146e8da77ec0e4a85d.zip |
Auto merge of #25864 - mrobinson:rename-layout, r=jdm
Rename AbsolutelyPositionedBox::layout to AbsolutelyPositionedBox::to_hoisted
This method doesn't actually do any layout, but converts this block to a
HoistedAbsolutelyPositionedBox which is hoisted and then laid-out with
its containing block later. This makes the code a little easier to read.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it does not change behavior.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r-- | components/layout_2020/flow/inline.rs | 2 | ||||
-rw-r--r-- | components/layout_2020/flow/mod.rs | 2 | ||||
-rw-r--r-- | components/layout_2020/positioned.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index bab919f38c9..a33e5d8932a 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -255,7 +255,7 @@ impl InlineFormattingContext { }, }; ifc.positioning_context - .push(box_.layout(initial_start_corner, tree_rank)); + .push(box_.to_hoisted(initial_start_corner, tree_rank)); }, InlineLevelBox::OutOfFlowFloatBox(_box_) => { // TODO diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 39f57bf4402..d6ab15071f6 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -320,7 +320,7 @@ impl BlockLevelBox { )) }, BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => { - positioning_context.push(box_.layout(Vec2::zero(), tree_rank)); + positioning_context.push(box_.to_hoisted(Vec2::zero(), tree_rank)); Fragment::Anonymous(AnonymousFragment::no_op( containing_block.style.writing_mode, )) diff --git a/components/layout_2020/positioned.rs b/components/layout_2020/positioned.rs index ef561a05692..3747b4661b5 100644 --- a/components/layout_2020/positioned.rs +++ b/components/layout_2020/positioned.rs @@ -86,7 +86,7 @@ impl AbsolutelyPositionedBox { } } - pub(crate) fn layout( + pub(crate) fn to_hoisted( &self, initial_start_corner: Vec2<Length>, tree_rank: usize, |