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.

Sign up for GitHub

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

Jump to bottom

style: Sync changes from mozilla-central. #20637

Merged
merged 4 commits into from
Apr 14, 2018
Merged

style: Sync changes from mozilla-central. #20637

merged 4 commits into from
Apr 14, 2018

Conversation

emilio
Copy link
Member

@emilio emilio commented Apr 14, 2018 •
edited by SimonSapin

See individual commits for details.

This change is Reviewable

bholley and others added 4 commits April 14, 2018 21:15
@bholley @emilio
nsstring: Make ns{,C}String Sync/Send.
156ef81 
Bug: 1454021
Reviewed-by: mystor
MozReview-Commit-ID: DeBOgxxTvBR
@jwatt @emilio
style: Use a user defined type for font weight everywhere.
245d848 
Bug: 1436048
Reviewed-by: emilio
@emilio
style: Fix IsInAnonymousSubtree to account for XBL in Shadow DOM.
3ef77f5 
Bug: 1453206
Reviewed-by: smaug
MozReview-Commit-ID: B2aYury8K7i
@emilio
style: Update binidngs.
0d15ab1
@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/gecko/generated/structs.rs, components/style/gecko/generated/bindings.rs, components/style/gecko/generated/atom_macro.rs, components/style/values/computed/font.rs and 3 more
  • @canaltinova: components/style/properties/gecko.mako.rs, components/style/gecko/generated/structs.rs, components/style/gecko/generated/bindings.rs, components/style/gecko/generated/atom_macro.rs, components/style/values/computed/font.rs and 3 more

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 14, 2018
@emilio
Copy link
Member Author

emilio commented Apr 14, 2018

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 0d15ab1 has been approved by emilio

@highfive highfive assigned emilio and unassigned avadacatavra Apr 14, 2018
@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 Apr 14, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit 0d15ab1 with merge d8dfa98...

bors-servo pushed a commit that referenced this pull request Apr 14, 2018
Auto merge of #20637 - emilio:gecko-sync, r=emilio
d8dfa98 
style: Sync changes from mozilla-central.

See individual commits for details.
@bors-servo
Copy link
Contributor

☀️ 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: emilio
Pushing d8dfa98 to master...

@bors-servo bors-servo merged commit 0d15ab1 into servo:master Apr 14, 2018
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 14, 2018
@emilio emilio deleted the gecko-sync branch April 14, 2018 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@emilio @highfive @bors-servo @avadacatavra @bholley @jwatt