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: Support 'shape-image-threshold' property #19436

Merged
merged 2 commits into from Dec 3, 2017
Merged

style: Support 'shape-image-threshold' property #19436

merged 2 commits into from Dec 3, 2017

Conversation

aethanyc
Copy link
Contributor

@aethanyc aethanyc commented Nov 30, 2017 •
edited by SimonSapin

This has been reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1265343

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/gecko/generated/bindings.rs, components/style/properties/longhand/box.mako.rs, components/style/gecko/generated/structs.rs
  • @canaltinova: components/style/gecko/generated/bindings.rs, components/style/properties/longhand/box.mako.rs, components/style/gecko/generated/structs.rs
  • @emilio: components/style/gecko/generated/bindings.rs, components/style/properties/longhand/box.mako.rs, components/style/gecko/generated/structs.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Nov 30, 2017
@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!

@aethanyc
Copy link
Contributor Author

@bors-servo r=heycam p=1

@bors-servo
Copy link
Contributor

📌 Commit 925d3e3 has been approved by heycam

@highfive highfive assigned heycam and unassigned metajack Nov 30, 2017
@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 Nov 30, 2017
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #19434) 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 Nov 30, 2017
@aethanyc
style: Support 'shape-image-threshold' property
1b14ca3 
MozReview-Commit-ID: 14lzl3ln3Rg
@aethanyc
style: Update gecko bindings
668795a 
MozReview-Commit-ID: CBPdp0e1k6h
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Dec 1, 2017
@aethanyc
Copy link
Contributor Author

aethanyc commented Dec 1, 2017

@bors-servo r=heycam p=1

@bors-servo
Copy link
Contributor

📌 Commit 668795a has been approved by heycam

@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 Dec 1, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 668795a with merge 1801cbd...

bors-servo pushed a commit that referenced this pull request Dec 1, 2017
Auto merge of #19436 - aethanyc:shape-image-threshold, r=heycam
1801cbd 
style: Support 'shape-image-threshold' property

This has been reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1265343

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

💔 Test failed - mac-dev-unit

@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 Dec 1, 2017
@aethanyc
Copy link
Contributor Author

aethanyc commented Dec 1, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-css, mac-dev-unit...

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Dec 1, 2017
@jdm
Copy link
Member

jdm commented Dec 1, 2017

Ugh, same problem observed in #19441 but on a different build machine :(

@jdm
Copy link
Member

jdm commented Dec 1, 2017

I have pressed the "graceful shutdown" button; hopefully retrying will cause a different machine to be selected.

@aethanyc
Copy link
Contributor Author

aethanyc commented Dec 2, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

⌛ Testing commit 668795a with merge d198caa...

bors-servo pushed a commit that referenced this pull request Dec 2, 2017
Auto merge of #19436 - aethanyc:shape-image-threshold, r=heycam
d198caa 
style: Support 'shape-image-threshold' property

This has been reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1265343

<!-- 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/19436)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Dec 2, 2017
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@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 Dec 2, 2017
@aethanyc
Copy link
Contributor Author

aethanyc commented Dec 3, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, arm64, linux-dev, 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 are reusable. Rebuilding only linux-rel-css...

@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: heycam
Pushing d198caa to master...

@bors-servo bors-servo merged commit 668795a into servo:master Dec 3, 2017
@bors-servo bors-servo mentioned this pull request Dec 3, 2017
Merged
@aethanyc aethanyc deleted the shape-image-threshold branch December 3, 2017 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@heycam heycam

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@aethanyc @highfive @bors-servo @jdm @metajack @heycam