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

Expose the source map URL on a style sheet #18073

Merged
merged 1 commit into from Aug 17, 2017
Merged

Expose the source map URL on a style sheet #18073

merged 1 commit into from Aug 17, 2017

Conversation

@tromey
Copy link
Contributor

tromey commented Aug 14, 2017 •
edited by SimonSapin

This changes Servo to track the source map URL of a style sheet. This
parallels a change going in to Gecko:
https://bugzilla.mozilla.org/show_bug.cgi?id=1388855

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix N/A - but see the bug in Bugzilla (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

Note also that there are tests going into M-C as well as part of bug 1388855.

This change is Reviewable
@highfive
Copy link

highfive commented Aug 14, 2017

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @cbrewster (or someone else) soon.
@highfive
Copy link

highfive commented Aug 14, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/gecko/generated/bindings.rs, components/style/stylesheets/stylesheet.rs
  • @canaltinova: components/style/gecko/generated/bindings.rs, components/style/stylesheets/stylesheet.rs
  • @KiChjang: components/script/dom/htmlmetaelement.rs, components/script/stylesheet_loader.rs
  • @fitzgen: components/script/dom/htmlmetaelement.rs, components/script/stylesheet_loader.rs
  • @emilio: ports/geckolib/glue.rs, components/style/gecko/generated/bindings.rs, components/style/stylesheets/stylesheet.rs
@highfive
Copy link

highfive commented Aug 14, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2017

☔ The latest upstream changes (presumably #17891) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
Copy link
Member

jdm commented Aug 15, 2017

r? @SimonSapin
@highfive highfive assigned SimonSapin and unassigned cbrewster Aug 15, 2017
@tromey tromey force-pushed the tromey:source-map-url branch from 69f2dd9 to 5e98b0c Aug 16, 2017
@tromey
Copy link
Contributor Author

tromey commented Aug 16, 2017

I rebased it.
@jdm jdm removed the S-needs-rebase label Aug 16, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Aug 16, 2017

☔ The latest upstream changes (presumably #18114) made this pull request unmergeable. Please resolve the merge conflicts.
@tromey tromey force-pushed the tromey:source-map-url branch from 5e98b0c to 54aed52 Aug 16, 2017
@tromey
Copy link
Contributor Author

tromey commented Aug 16, 2017

Rebased again.
@jdm jdm removed the S-needs-rebase label Aug 16, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

☔ The latest upstream changes (presumably #18118) made this pull request unmergeable. Please resolve the merge conflicts.
@tromey
Expose the source map URL on a style sheet
Loading status checks…
7224a56 
This changes Servo to track the source map URL of a style sheet.  This
parallels a change going in to Gecko:
https://bugzilla.mozilla.org/show_bug.cgi?id=1388855
@tromey tromey force-pushed the tromey:source-map-url branch from 54aed52 to 7224a56 Aug 17, 2017
@tromey
Copy link
Contributor Author

tromey commented Aug 17, 2017

Rebased again.
@SimonSapin
Copy link
Member

SimonSapin commented Aug 17, 2017

Oops, sorry for the delay and multiple rebases.

Looks good.

@bors-servo r+

Reviewed 7 of 7 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

📌 Commit 7224a56 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

⌛ Testing commit 7224a56 with merge 6ddbf56...
bors-servo added a commit that referenced this pull request Aug 17, 2017
@bors-servo
Auto merge of #18073 - tromey:source-map-url, r=SimonSapin
Loading status checks…
6ddbf56 
Expose the source map URL on a style sheet

This changes Servo to track the source map URL of a style sheet.  This
parallels a change going in to Gecko:
https://bugzilla.mozilla.org/show_bug.cgi?id=1388855

<!-- 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
- [X] These changes fix N/A - but see the bug in Bugzilla (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

Note also that there are tests going into M-C as well as part of bug 1388855.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/18073)
<!-- Reviewable:end -->
@bors-servo bors-servo mentioned this pull request Aug 17, 2017
Merged
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: SimonSapin
Pushing 6ddbf56 to master...
@bors-servo bors-servo merged commit 7224a56 into servo:master Aug 17, 2017
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
@SimonSapin SimonSapin mentioned this pull request Aug 17, 2017
Closed
@tromey tromey deleted the tromey:source-map-url branch Aug 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@tromey @highfive @bors-servo @jdm @SimonSapin @cbrewster
You can’t perform that action at this time.