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

Move algorithm for insertRule and deleteRule to style component #14355

Merged
merged 3 commits into from Nov 28, 2016

Conversation

@upsuper
Copy link
Member

upsuper commented Nov 24, 2016

r? @Manishearth


  • ./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 change is Reviewable

@highfive
Copy link

highfive commented Nov 24, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/stylesheets.rs
  • @KiChjang: components/script/dom/cssrulelist.rs
  • @fitzgen: components/script/dom/cssrulelist.rs
  • @emilio: components/style/stylesheets.rs
@highfive
Copy link

highfive commented Nov 24, 2016

warning Warning warning

  • These commits modify style and script code, but no tests are modified. Please consider adding a test!
@bors-servo
Copy link
Contributor

bors-servo commented Nov 24, 2016

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

upsuper added 3 commits Nov 24, 2016
This also changes the algorithm to match w3c/csswg-drafts#754 instead of
the current cssom draft, because that makes the code simpler and matches
implementation of other browsers.
@upsuper upsuper force-pushed the upsuper-forks:rulelist-mutate branch from a8e85ce to 3e7818f Nov 24, 2016
@Manishearth
Copy link
Member

Manishearth commented Nov 27, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2016

📌 Commit 3e7818f has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2016

Testing commit 3e7818f with merge b18ec28...

bors-servo added a commit that referenced this pull request Nov 27, 2016
Move algorithm for insertRule and deleteRule to style component

<!-- Please describe your changes on the following line: -->

r? @Manishearth

---
<!-- 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
- [ ] 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. -->

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

bors-servo commented Nov 28, 2016

@bors-servo bors-servo merged commit 3e7818f into servo:master Nov 28, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@upsuper upsuper deleted the upsuper-forks:rulelist-mutate branch Nov 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.