Skip to content
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

Simplify stacking context collection #13417

Merged

Conversation

mrobinson
Copy link
Member

@mrobinson mrobinson commented Sep 25, 2016


  • ./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 _____

Simplify the way that stacking contexts are collected. Instead of
passing the StackingContextId down the tree, pass the parent
StackingContext itself. This will allow future patches to get more
information about the parent stacking context (such as location).

Also remove the return value of collect_stacking_contexts, which was
unused.


This change is Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 25, 2016
@highfive
Copy link

warning Warning warning

  • These commits modify gfx and layout code, but no tests are modified. Please consider adding a test!

@Manishearth
Copy link
Member

r? @gilles-leblanc

@Manishearth
Copy link
Member

r? @glennw

autocomplete fail

@highfive highfive assigned glennw and unassigned Manishearth Sep 25, 2016
@glennw
Copy link
Member

glennw commented Sep 25, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 9995479 has been approved by glennw

@highfive 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 Sep 25, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 9995479 with merge 8a7af01...

bors-servo pushed a commit that referenced this pull request Sep 25, 2016
…, r=glennw

Simplify stacking context collection

<!-- 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: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

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

Simplify the way that stacking contexts are collected. Instead of
passing the StackingContextId down the tree, pass the parent
StackingContext itself. This will allow future patches to get more
information about the parent stacking context (such as location).

Also remove the return value of collect_stacking_contexts, which was
unused.

<!-- 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/13417)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-dev

@highfive 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 Sep 25, 2016
@jdm jdm added S-fails-tidy `./mach test-tidy` reported errors. and removed S-tests-failed The changes caused existing tests to fail. labels Sep 26, 2016
@mrobinson mrobinson force-pushed the simplify-stacking-context-collection branch from 9995479 to 8831644 Compare September 26, 2016 09:24
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 26, 2016
@mrobinson
Copy link
Member Author

Really sorry about the failure. I had fixed the tidy error, but had forgotten to commit it. 😳 It should be fine now.

@glennw
Copy link
Member

glennw commented Sep 26, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 8831644 has been approved by glennw

@highfive 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 Sep 26, 2016
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #13346) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 27, 2016
Simplify the way that stacking contexts are collected. Instead of
passing the StackingContextId down the tree, pass the parent
StackingContext itself. This will allow future patches to get more
information about the parent stacking context (such as location).

Also remove the return value of collect_stacking_contexts, which was
unused.
@mrobinson mrobinson force-pushed the simplify-stacking-context-collection branch from 8831644 to 0667759 Compare September 27, 2016 08:49
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 27, 2016
@mrobinson
Copy link
Member Author

The build failed in stylo_tests. I'm not sure it is related to my PR:

error[E0463]: can't find crate for `gecko_bindings`
 --> /home/travis/build/servo/servo/tests/unit/stylo/lib.rs:7:1
  |
7 | extern crate gecko_bindings;
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate

error: aborting due to previous error

I can't seem to find any bugs referencing this issue.

@jdm
Copy link
Member

jdm commented Sep 29, 2016

Preexisting Travis failure that's masked by the permanent failure due to too much log.

@mrobinson
Copy link
Member Author

@jdm Sorry. I'm not sure I totally understand. Is the pre-existing failure one that I caused via a previous version of this PR?

@jdm
Copy link
Member

jdm commented Sep 29, 2016

No, it happens on master too.

@mrobinson
Copy link
Member Author

mrobinson commented Sep 29, 2016

@bors-servo r=glennw

@bors-servo
Copy link
Contributor

📌 Commit 0667759 has been approved by glennw

@highfive 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. S-needs-rebase There are merge conflict errors. labels Sep 29, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 0667759 with merge 81dfa6a...

bors-servo pushed a commit that referenced this pull request Sep 29, 2016
…, r=glennw

Simplify stacking context collection

<!-- 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: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

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

Simplify the way that stacking contexts are collected. Instead of
passing the StackingContextId down the tree, pass the parent
StackingContext itself. This will allow future patches to get more
information about the parent stacking context (such as location).

Also remove the return value of collect_stacking_contexts, which was
unused.

<!-- 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/13417)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

@bors-servo bors-servo merged commit 0667759 into servo:master Sep 29, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 29, 2016
@mrobinson mrobinson deleted the simplify-stacking-context-collection branch September 30, 2016 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-fails-tidy `./mach test-tidy` reported errors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants