mirror of
https://github.com/servo/servo.git
synced 2025-08-09 23:45:35 +01:00
layout: Have TextRun::glyph_run_is_preserved_newline
take into account TextRunSegment
offset (#32119)
A `TextRun` is composed of `TextRunSegment`s that are composed of `GlyphRun`s. `TextRun::glyph_run_is_preserved_newline` is indexing into the `TextRun` text, but the `GlyphRun` indexes that it uses are relative to the `TextRunSegment` offset. Before the code was using the offset without incorporating the `TextRunSegment` offset. This led to miscalculation of preserved newline location while processing text content. <!-- 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 - [x] There are tests for these changes <!-- 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. -->
This commit is contained in:
parent
fa92b0f65f
commit
a7838ae7cc
3 changed files with 9 additions and 6 deletions
|
@ -2397,7 +2397,7 @@ impl<'a> ContentSizesComputation<'a> {
|
|||
if run.glyph_store.is_whitespace() {
|
||||
// If this run is a forced line break, we *must* break the line
|
||||
// and start measuring from the inline origin once more.
|
||||
if text_run.glyph_run_is_preserved_newline(run) {
|
||||
if text_run.glyph_run_is_preserved_newline(segment, run) {
|
||||
self.forced_line_break();
|
||||
self.current_line = ContentSizes::zero();
|
||||
continue;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue