layout: Clean up inline_metrics_of_block a little. #17556
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Heads up! This PR modifies the following files:
|
|
|
highfive
added
the
S-awaiting-review
|
r? @emilio this looks more like your sort of thing! |
emilio
reviewed
Jul 5, 2017
components/layout/fragment.rs
Outdated
| (baseline_offset, border_box_block_size - baseline_offset + end_margin) | ||
| }, | ||
| // Case B | ||
| _ => (border_box_block_size + end_margin, Au(0)) |
There was a problem hiding this comment.
Seems like you could derive space_below_baseline from ascent, using:
let space_below_baseline = border_box_block_size + end_margin - ascent;I think it would be slightly more readable, what do you think?
There was a problem hiding this comment.
Yep, that sounds better--thanks!
|
@bors-servo try |
bors-servo
pushed a commit
that referenced
this pull request
Jul 5, 2017
[WIP] layout: Clean up inline_metrics_of_block a little. Previously the variable names were a little confusing (ascent was used for the space_above_baseline in one branch and the and ascent field in another branch, and was not really the ascent in one). Also add a small diagram. <!-- 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 they just refactor existing code <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17556) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
jyc
changed the title
Previously the variable names were a little confusing (ascent was used for the space_above_baseline in one branch and the and ascent field in another branch, and was not really the ascent in one). Also add a small diagram.
jyc
force-pushed
the
inline-metrics-of-block
branch
from
d2403df
to
7a7dfe4
Compare
|
Strange, seems to fail when compiling |
|
@bors-servo r+ I think that's intermittent, and we don't gate on travis. Thanks for the cleanup @jyc! |
|
📌 Commit 7a7dfe4 has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
Jul 6, 2017
layout: Clean up inline_metrics_of_block a little. Previously the variable names were a little confusing (ascent was used for the space_above_baseline in one branch and the and ascent field in another branch, and was not really the ascent in one). Also add a small diagram. <!-- 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 they just refactor existing code <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17556) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the variable names were a little confusing (ascent was used
for the space_above_baseline in one branch and the and ascent field in
another branch, and was not really the ascent in one). Also add a
small diagram.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is