Overwrite default RunInfo values with the first real ones encountered. #16258

jdm · 2017-04-04T13:18:32Z

TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix Layout assertion visiting google accounts help page #14783
There are tests for these changes

This change is

highfive · 2017-04-04T13:18:36Z

Heads up! This PR modifies the following files:

@emilio: components/layout/text.rs

highfive · 2017-04-04T13:18:37Z

Warning

These commits include an empty title element (<title></title>). Consider adding appropriate metadata.

jdm · 2017-04-04T13:18:43Z

@stshine Is this something you could review?

jdm · 2017-04-04T13:19:04Z

@bors-servo: try

bors-servo · 2017-04-04T13:19:09Z

⌛ Trying commit 60f09b7 with merge 4a3a692...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-04T13:44:32Z

💔 Test failed - linux-rel-wpt

jdm · 2017-04-04T13:52:10Z

Sigh. The new test passes on my macbook and fails on both the linux and mac builders.

stshine

This looks good to me. However, to make text-overflow actually working we need #16265 get merged first.

stshine · 2017-04-05T19:44:19Z

components/layout/text.rs

@@ -230,6 +231,14 @@ impl TextRunScanner {
                        None => false
                    };

+                    if !initialized_run_info {


During the iteration every time we start to deal with a fragment if the font changed we may create an empty mapping, and when we are done with the fragment we flush all the remaining text to mapping, so instead using a temp variable for the whole iteration we should check if end_position is zero.

stshine · 2017-04-06T00:41:04Z

@bors-servo try

stshine · 2017-04-06T00:42:11Z

@bors-servo retry

bors-servo · 2017-04-06T00:42:15Z

⌛ Trying commit 60f09b7 with merge d93d627...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-06T01:20:59Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
State: approved= try=True

stshine

Looks good!

jdm · 2017-04-11T06:52:48Z

@bors-servo: r=stshine

bors-servo · 2017-04-11T06:52:49Z

📌 Commit a2e8ab4 has been approved by stshine

bors-servo · 2017-04-11T06:52:52Z

⌛ Testing commit a2e8ab4 with merge a5b035e...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-11T07:18:19Z

💔 Test failed - mac-rel-css

jdm · 2017-04-12T04:59:03Z

@bors-servo: try

bors-servo · 2017-04-12T04:59:07Z

⌛ Trying commit 7c9efa6 with merge e07f484...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-12T05:46:22Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
State: approved= try=True

jdm · 2017-04-12T06:36:11Z

@pcwalton Could you verify that this makes sense?

pcwalton · 2017-04-12T23:43:49Z

Looks good overall. Only one nit: maybe rename flush_mapping to new_mapping_needed. With this patch as is, the flush_mapping Boolean doesn't necessarily mean the mapping is flushed, which could be confusing.

jdm · 2017-04-12T23:57:42Z

@bors-servo: r=pcwalton,stshine

bors-servo · 2017-04-12T23:57:42Z

📌 Commit a20d0bc has been approved by pcwalton,stshine

bors-servo · 2017-04-12T23:57:46Z

⌛ Testing commit a20d0bc with merge 628ba1d...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-13T00:04:27Z

💔 Test failed - android

jdm · 2017-04-13T04:07:54Z

@bors-servo: retry

bors-servo · 2017-04-13T04:09:54Z

⌛ Testing commit a20d0bc with merge 9c0d8e4...

Overwrite default RunInfo values with the first real ones encountered. TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14783 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)

bors-servo · 2017-04-13T04:57:16Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: pcwalton,stshine
Pushing 9c0d8e4 to master...

stshine · 2017-04-13T05:05:20Z

@jdm Thank you for letting me review.

highfive assigned asajeffrey Apr 4, 2017

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 4, 2017

highfive added the S-tests-failed The changes caused existing tests to fail. label Apr 4, 2017

stshine requested changes Apr 5, 2017

View reviewed changes

stshine reviewed Apr 5, 2017

View reviewed changes

jdm force-pushed the panic-at-the-ellipsis branch from 60f09b7 to a2e8ab4 Compare April 11, 2017 05:00

highfive removed the S-tests-failed The changes caused existing tests to fail. label Apr 11, 2017

stshine approved these changes Apr 11, 2017

View reviewed changes

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 11, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Apr 11, 2017

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Apr 12, 2017

Overwrite default RunInfo values with the first real ones encountered.

a20d0bc

jdm force-pushed the panic-at-the-ellipsis branch from 7c9efa6 to a20d0bc Compare April 12, 2017 23:57

highfive assigned pcwalton and unassigned asajeffrey Apr 12, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 12, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Apr 13, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Apr 13, 2017

bors-servo merged commit a20d0bc into servo:master Apr 13, 2017

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 13, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Overwrite default RunInfo values with the first real ones encountered. #16258

Overwrite default RunInfo values with the first real ones encountered. #16258

jdm commented Apr 4, 2017 •

edited by larsbergstrom

highfive commented Apr 4, 2017

highfive commented Apr 4, 2017

jdm commented Apr 4, 2017

jdm commented Apr 4, 2017

bors-servo commented Apr 4, 2017

bors-servo commented Apr 4, 2017

jdm commented Apr 4, 2017 •

edited

stshine left a comment

stshine Apr 5, 2017 •

edited

jdm Apr 11, 2017

stshine commented Apr 6, 2017

stshine commented Apr 6, 2017

bors-servo commented Apr 6, 2017

bors-servo commented Apr 6, 2017

stshine left a comment

jdm commented Apr 11, 2017

bors-servo commented Apr 11, 2017

bors-servo commented Apr 11, 2017

bors-servo commented Apr 11, 2017

jdm commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 12, 2017

jdm commented Apr 12, 2017

pcwalton commented Apr 12, 2017

jdm commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 13, 2017

jdm commented Apr 13, 2017

bors-servo commented Apr 13, 2017

bors-servo commented Apr 13, 2017

stshine commented Apr 13, 2017

Overwrite default RunInfo values with the first real ones encountered. #16258

Overwrite default RunInfo values with the first real ones encountered. #16258

Conversation

jdm commented Apr 4, 2017 • edited by larsbergstrom

highfive commented Apr 4, 2017

highfive commented Apr 4, 2017

jdm commented Apr 4, 2017

jdm commented Apr 4, 2017

bors-servo commented Apr 4, 2017

bors-servo commented Apr 4, 2017

jdm commented Apr 4, 2017 • edited

stshine left a comment

Choose a reason for hiding this comment

stshine Apr 5, 2017 • edited

Choose a reason for hiding this comment

jdm Apr 11, 2017

Choose a reason for hiding this comment

stshine commented Apr 6, 2017

stshine commented Apr 6, 2017

bors-servo commented Apr 6, 2017

bors-servo commented Apr 6, 2017

stshine left a comment

Choose a reason for hiding this comment

jdm commented Apr 11, 2017

bors-servo commented Apr 11, 2017

bors-servo commented Apr 11, 2017

bors-servo commented Apr 11, 2017

jdm commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 12, 2017

jdm commented Apr 12, 2017

pcwalton commented Apr 12, 2017

jdm commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 12, 2017

bors-servo commented Apr 13, 2017

jdm commented Apr 13, 2017

bors-servo commented Apr 13, 2017

bors-servo commented Apr 13, 2017

stshine commented Apr 13, 2017

jdm commented Apr 4, 2017 •

edited by larsbergstrom

jdm commented Apr 4, 2017 •

edited

stshine Apr 5, 2017 •

edited