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

Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId #13957

Merged
merged 2 commits into from Oct 30, 2016
Merged

Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId #13957

merged 2 commits into from Oct 30, 2016
+540 −301

Conversation

@mrobinson
Copy link
Member

mrobinson commented Oct 28, 2016 •
edited by larsbergstrom

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because this PR should not change behavior.

This change is Reviewable
@highfive
Copy link

highfive commented Oct 28, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script_traits/lib.rs, components/script_traits/lib.rs
  • @fitzgen: components/script_traits/lib.rs, components/script_traits/lib.rs
  • @emilio: components/layout/display_list_builder.rs, components/layout/table_rowgroup.rs, components/layout/table_wrapper.rs, components/layout/block.rs, components/layout/table_row.rs, components/layout/webrender_helpers.rs, components/layout/table_caption.rs, components/layout/flex.rs, components/layout/table_cell.rs, components/layout/traversal.rs, components/layout/table_colgroup.rs, components/layout/sequential.rs, components/layout/inline.rs, components/layout/flow.rs, components/layout/multicol.rs, components/layout/list_item.rs, components/layout/table.rs
@highfive
Copy link

highfive commented Oct 28, 2016

warning Warning warning

  • These commits modify gfx and layout code, but no tests are modified. Please consider adding a test!
@mrobinson
Copy link
Member Author

mrobinson commented Oct 28, 2016

@glennw or @pcwalton r?
@glennw
Copy link
Member

glennw commented Oct 28, 2016

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

bors-servo commented Oct 28, 2016

⌛ Trying commit 21da2d0 with merge 1ad8e66...
@bors-servo
Copy link
Contributor

bors-servo commented Oct 29, 2016

💥 Test timed out
@jdm
Copy link
Member

jdm commented Oct 29, 2016

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

bors-servo commented Oct 29, 2016

⌛ Trying commit 21da2d0 with merge a06cb1c...
bors-servo added a commit that referenced this pull request Oct 29, 2016
@bors-servo
Auto merge of #13957 - mrobinson:scroll_root, r=<try>
Loading status checks…
a06cb1c 
Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId

<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because this PR should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13957)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 29, 2016

💔 Test failed - windows-dev
@jdm jdm mentioned this pull request Oct 29, 2016
Closed
@jdm
Copy link
Member

jdm commented Oct 29, 2016

That is not the actual log that shows the failure; I filed servo/saltfs#530 about this problem.
@jdm
Copy link
Member

jdm commented Oct 29, 2016

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

bors-servo commented Oct 29, 2016

⌛ Trying commit 21da2d0 with merge 6bc4ae7...
bors-servo added a commit that referenced this pull request Oct 29, 2016
@bors-servo
Auto merge of #13957 - mrobinson:scroll_root, r=<try>
Loading status checks…
6bc4ae7 
Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId

<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because this PR should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13957)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 30, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev
@jdm jdm removed the S-tests-failed label Oct 30, 2016
@glennw
glennw reviewed Oct 30, 2016
View changes
Copy link
Member

glennw left a comment

One question, r=me once that's resolved.
components/gfx/display_list/mod.rs Outdated
if let Some(scroll_offset) = scroll_offsets.get(&stacking_context.id) {
translated_point.x -= Au::from_f32_px(scroll_offset.x);
translated_point.y -= Au::from_f32_px(scroll_offset.y);
if stacking_context.id != StackingContextId::root() {

This comment has been minimized.

Sign in to view
@glennw

glennw Oct 30, 2016

Member

Shouldn't this still check !is_fixed?

This comment has been minimized.

Sign in to view
@mrobinson

mrobinson Oct 30, 2016

Author Member

Yes, I think so, in order to not change behavior. In the future, fixed position overlow:scroll stacking contexts will be supported.

This comment has been minimized.

Sign in to view
@mrobinson

mrobinson Oct 30, 2016

Author Member

Okay. Thanks for pointing that out! I've fixed it in the latest version of the branch.
mrobinson added 2 commits Oct 21, 2016
@mrobinson
Use a new id type for tracking scrolling areas
71d285a 
This is a step in disassociating scrolling areas from stacking
contexts. Now scroll areas are defined by unique ids, which means that
in the future stacking context will be able to contain more than one.
@mrobinson
Update WebRender
Loading status checks…
05beb59 
This is necessary because the API has changed for scrolling ids.
@mrobinson mrobinson force-pushed the mrobinson:scroll_root branch from 21da2d0 to 05beb59 Oct 30, 2016
@mrobinson
Copy link
Member Author

mrobinson commented Oct 30, 2016

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

bors-servo commented Oct 30, 2016

📌 Commit 05beb59 has been approved by glennw
@highfive highfive assigned glennw and unassigned Manishearth Oct 30, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Oct 30, 2016

⌛ Testing commit 05beb59 with merge 3a3f319...
bors-servo added a commit that referenced this pull request Oct 30, 2016
@bors-servo
Auto merge of #13957 - mrobinson:scroll_root, r=glennw
Loading status checks…
3a3f319 
Track overflow:scroll stacking contexts with ScrollRootId instead of StackingContextId

<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because this PR should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13957)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 30, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev
@bors-servo bors-servo merged commit 05beb59 into servo:master Oct 30, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mrobinson mrobinson deleted the mrobinson:scroll_root branch Nov 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@glennw glennw

Assignees

@glennw glennw

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@mrobinson @highfive @glennw @bors-servo @jdm @Manishearth
You can’t perform that action at this time.