Replace ServoStackingContextId with ServoScrollRootId #467
Conversation
|
@glennw r? |
There was a problem hiding this comment.
This looks good to me (just the one question / change). However, since this changes API it probably makes sense to hold off on merging it until I land the last WR update, which is blocked on a 1-pixel accuracy issue in the filter shader. I'll try and get that sorted today.
| @@ -397,13 +397,13 @@ pub struct ScrollLayerId { | |||
| #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)] | |||
| pub enum ScrollLayerInfo { | |||
| Fixed, | |||
| Scrollable(usize) | |||
| Scrollable(usize, ServoScrollRootId) | |||
There was a problem hiding this comment.
Should we just call this ScrollRootId instead?
There was a problem hiding this comment.
Hrm. I'm not sure. I kept the same naming scheme as ServoStackingContextId in the off-chance that WebRender also grew an understanding (and an id) for ScrollRoots. I guess we can land this PR and then investigate later once my first round of work is complete.
|
@mrobinson OK, the WR update in master has landed. So feel free to merge this when you have the corresponding servo update ready. |
|
@bors-servo r=glennw |
|
📌 Commit a27cf24 has been approved by |
Replace ServoStackingContextId with ServoScrollRootId <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/467) <!-- Reviewable:end -->
|
The Servo part of this change is here: https://github.com/mrobinson/servo/tree/scroll_id |
|
💔 Test failed - status-travis |
|
The issue seems to be with the rayon compilation: |
|
☔ The latest upstream changes (presumably #445) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@mrobinson The CI-related issues have been resolved, but this will need to be rebased then it should be fine to land. |
Since scrolling is being disassociated from stacking contexts in Servo, this change introduces ScrollRootId from Servo into WebRender.
This is necessary because the API has changed in a backwards incompatible way.
|
@glennw Thanks. I'll try this one more time. |
|
@bors-servo retry |
|
@bors-servo: r=glennw |
|
📌 Commit bb1b817 has been approved by |
|
⚡ Test exempted - status |
Replace ServoStackingContextId with ServoScrollRootId <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/467) <!-- Reviewable:end -->
|
@emilio Thanks! |
This change is