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

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*. #6940

Merged
merged 1 commit into from Aug 4, 2015
Merged

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*. #6940

merged 1 commit into from Aug 4, 2015
+55 −13

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Aug 3, 2015

r? @mbrubeck

Review on Reviewable
@mbrubeck
Copy link
Contributor

mbrubeck commented Aug 3, 2015

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

bors-servo commented Aug 3, 2015

📌 Commit 504e1bf has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Aug 4, 2015

⌛ Testing commit 504e1bf with merge deb1597...
bors-servo pushed a commit that referenced this pull request Aug 4, 2015
bors-servo
Auto merge of #6940 - pcwalton:inline-pseudo-repair-jumpiness, r=mbru…
deb1597 
…beck

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*.

r? @mbrubeck

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

bors-servo commented Aug 4, 2015

💔 Test failed - mac2
@jdm
Copy link
Member

jdm commented Aug 4, 2015 

/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1704:5: 1707:47 error: this function takes 5 parameters but 4 parameters were supplied [E0061]
/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1704     Fragment::from_opaque_node_and_style(node.address,
/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1705                                          node.style.clone(),
/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1706                                          restyle_damage,
/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1707                                          info)
/Users/servo/buildbot/slave/mac2/build/components/layout/construct.rs:1704:5: 1707:47 help: run `rustc --explain E0061` to see a detailed explanation
error: aborting due to previous error
Could not compile `layout`.
@pcwalton
layout: When repairing styles for incremental reflow, only repair
Loading status checks…
0a589d4 
styles of nodes that represent the dirty node, *including its
pseudo-element*.

Fixes lots more jumpiness.

A manual test, `inline-pseudo-repair-jumpiness.html`, has been added. I
was unable to automate it, so I will file a followup issue on that.
@pcwalton pcwalton force-pushed the pcwalton:inline-pseudo-repair-jumpiness branch from 504e1bf to 0a589d4 Aug 4, 2015
@pcwalton
Copy link
Contributor Author

pcwalton commented Aug 4, 2015

@bors-servo: r=mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Aug 4, 2015

📌 Commit 0a589d4 has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Aug 4, 2015

⌛ Testing commit 0a589d4 with merge ca1b9bc...
bors-servo pushed a commit that referenced this pull request Aug 4, 2015
bors-servo
Auto merge of #6940 - pcwalton:inline-pseudo-repair-jumpiness, r=mbru…
ca1b9bc 
…beck

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*.

r? @mbrubeck

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

bors-servo commented Aug 4, 2015

💔 Test failed - linux3
@pcwalton
Copy link
Contributor Author

pcwalton commented Aug 4, 2015

@bors-servo: retry
@pcwalton
Copy link
Contributor Author

pcwalton commented Aug 4, 2015

#6818
@bors-servo
Copy link
Contributor

bors-servo commented Aug 4, 2015

⌛ Testing commit 0a589d4 with merge 56d3426...
bors-servo pushed a commit that referenced this pull request Aug 4, 2015
bors-servo
Auto merge of #6940 - pcwalton:inline-pseudo-repair-jumpiness, r=mbru…
Loading status checks…
56d3426 
…beck

layout: When repairing styles for incremental reflow, only repair styles of nodes that represent the dirty node, *including its pseudo-element*.

r? @mbrubeck

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

bors-servo commented Aug 4, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit 0a589d4 into servo:master Aug 4, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@pcwalton @mbrubeck @bors-servo @jdm @highfive
You can’t perform that action at this time.