Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets #8341

Merged
merged 3 commits into from Nov 7, 2015
Merged

Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets #8341

merged 3 commits into from Nov 7, 2015

Conversation

@bholley
Copy link
Contributor

bholley commented Nov 5, 2015

Review on Reviewable
@highfive
Copy link

highfive commented Nov 5, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@bholley
Copy link
Contributor Author

bholley commented Nov 5, 2015

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

🔒 Merge conflict
@bholley bholley force-pushed the bholley:state_hint_selector_ordering branch from c05ae51 to eb23e74 Nov 5, 2015
bholley added 2 commits Nov 5, 2015
@bholley
Load web fonts synchronously during wpt.
77c253f
@bholley
Consider all the pseudo-classes in a given compound selector when com…
d89816b 
…puting restyle hints, not just the rightmost one.

For some reason when I wrote this code I mixed up the rules for pseudo-elements
(rightmost, maximum of one) with those of pseudo-classes (which have no such
restriction). This caused a correctness issue which can be demonstrated with the
associated reftest modification.
@bholley bholley force-pushed the bholley:state_hint_selector_ordering branch from eb23e74 to 4501fdb Nov 5, 2015
@bholley
Copy link
Contributor Author

bholley commented Nov 5, 2015

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

⌛ Trying commit 4501fdb with merge 63f0469...
bors-servo added a commit that referenced this pull request Nov 5, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=<try>
63f0469 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

💔 Test failed - linux-dev
@jdm
Copy link
Member

jdm commented Nov 5, 2015 

/home/servo/buildbot/slave/linux-dev/build/components/script/dom/document.rs:1316:1: 1316:3 error: expected ident, found `<<`
/home/servo/buildbot/slave/linux-dev/build/components/script/dom/document.rs:1316 <<<<<<< HEAD
                                                                                  ^~
@bholley
Store pristine element state rather than a set of changes.
Loading status checks…
7dba444 
This is the strategy we'll need to take for attributes, and so this change
puts us in a position to handle attributes and state the same way.

This does mean that we stop taking care to track the situations where our
state has reverted to the original state, with no net change. I think that's
probably of negligible value though.
@bholley bholley force-pushed the bholley:state_hint_selector_ordering branch from 4501fdb to 7dba444 Nov 5, 2015
@highfive highfive removed the S-tests-failed label Nov 5, 2015
@bholley
Copy link
Contributor Author

bholley commented Nov 5, 2015

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

⌛ Trying commit 7dba444 with merge 99e1fd9...
bors-servo added a commit that referenced this pull request Nov 5, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=<try>
99e1fd9 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bholley
Copy link
Contributor Author

bholley commented Nov 5, 2015

r? @pcwalton
bholley added a commit to bholley/wptrunner that referenced this pull request Nov 5, 2015
@bholley
Pass the load-webfonts-synchronously flag to servo.
9e03b51 
Per servo/servo#8341
@bholley bholley mentioned this pull request Nov 5, 2015
Closed
@pcwalton
Copy link
Contributor

pcwalton commented Nov 6, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Nov 6, 2015

📌 Commit 7dba444 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

📌 Commit 7dba444 has been approved by larsbergstrom
@Manishearth
Copy link
Member

Manishearth commented Nov 7, 2015

@bors-servo retry try- r=larsberg
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

📌 Commit 7dba444 has been approved by larsberg
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge babc659...
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⛄ The build was interrupted to prioritize another pull request.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge afd4936...
bors-servo added a commit that referenced this pull request Nov 7, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=larsberg
afd4936 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⛄ The build was interrupted to prioritize another pull request.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge 4581605...
bors-servo added a commit that referenced this pull request Nov 7, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=larsberg
4581605 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@Manishearth
Copy link
Member

Manishearth commented Nov 7, 2015

This is going to fail the build due to a lockfile change. Apply the diff here to both lockfiles in ports/ and you should be good to go
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⛄ The build was interrupted to prioritize another pull request.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge 0f05f61...
bors-servo added a commit that referenced this pull request Nov 7, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=larsberg
0f05f61 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@Manishearth
Copy link
Member

Manishearth commented Nov 7, 2015

@bors-servo r- force

(So other PRs can build, since this is going to fail the CI -- someone re-r+ when the lockfile patch is applied)
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⛄ The build was interrupted to prioritize another pull request.
@Manishearth
Copy link
Member

Manishearth commented Nov 7, 2015

@bors-servo r=larsbergstrom

That failure should not have happened, my bad. Something off with the CI, will look at it again later. In the meantime, I'll keep this in the queue.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

📌 Commit 7dba444 has been approved by larsbergstrom
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge 1a800ae...
bors-servo added a commit that referenced this pull request Nov 7, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=larsber…
1a800ae 
…gstrom

Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⛄ The build was interrupted to prioritize another pull request.
@Manishearth
Copy link
Member

Manishearth commented Nov 7, 2015

Okay, ignore all the spam above about the lockfile; a infra deploy pulled in some untested changes and led to some confusing results. Your PR is fine, sorry about the confusion 😄

@bors-servo r=pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

📌 Commit 7dba444 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

⌛ Testing commit 7dba444 with merge 65c3185...
bors-servo added a commit that referenced this pull request Nov 7, 2015
@bors-servo
Auto merge of #8341 - bholley:state_hint_selector_ordering, r=pcwalton
Loading status checks…
65c3185 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 7, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 7dba444 into servo:master Nov 7, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Nov 7, 2015
Merged
@bholley bholley deleted the bholley:state_hint_selector_ordering branch Oct 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@bholley @highfive @bors-servo @jdm @pcwalton @larsbergstrom @Manishearth
You can’t perform that action at this time.