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

stylo: Implement shape-outside property #16384

Merged
merged 1 commit into from Apr 13, 2017
Merged

stylo: Implement shape-outside property #16384

merged 1 commit into from Apr 13, 2017

Conversation

canova
Copy link
Contributor

@canova canova commented Apr 12, 2017 •
edited by larsbergstrom

shape-outside property implemented.
r=Manishearth in bugzilla

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/gecko_bindings/bindings.rs, components/style/properties/gecko.mako.rs, components/style/properties/longhand/box.mako.rs, components/style/gecko/conversions.rs
  • @emilio: components/style/gecko_bindings/bindings.rs, components/style/properties/gecko.mako.rs, components/style/properties/longhand/box.mako.rs, components/style/gecko/conversions.rs

@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 12, 2017
@canova
Copy link
Contributor Author

canova commented Apr 12, 2017

r? @Manishearth
(I'm waiting for someone with push access to m-c :) )

@highfive highfive assigned Manishearth and unassigned jdm Apr 12, 2017
@canova
Copy link
Contributor Author

canova commented Apr 12, 2017

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

📌 Commit d0619a7 has been approved by Manishearth

@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 12, 2017
@Manishearth
Copy link
Member

@bors-servo p=1

needs coordinated landing

@bors-servo
Copy link
Contributor

⌛ Testing commit d0619a7 with merge c154683a9962902ddfebffad5f1b25e9d21f139e...

@bors-servo
Copy link
Contributor

⛄ The build was interrupted to prioritize another pull request.

@Manishearth
Copy link
Member

@bors-servo r-

will try coordinated landing tomorrow. hopefully servo queue will have cleared up by then

@Manishearth
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit d0619a7 has been approved by Manishearth

@bors-servo
Copy link
Contributor

⌛ Testing commit d0619a7 with merge 9d5dde2...

bors-servo pushed a commit that referenced this pull request Apr 13, 2017
Auto merge of #16384 - canaltinova:shape-outside, r=Manishearth
9d5dde2 
stylo: Implement shape-outside property

shape-outside property implemented.
r=Manishearth in bugzilla

---
<!-- 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 #15958 and [Bug 1355003](https://bugzilla.mozilla.org/show_bug.cgi?id=1355003)

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

💔 Test failed - android

@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 Apr 13, 2017
@Manishearth
Copy link
Member

@bors-servo retry

weird android failure

[armeabi] Gdbserver      : [arm-linux-androideabi-4.9] libs/armeabi/gdbserver
install -p /home/servo/android/ndk/r12b/android-ndk-r12b/prebuilt/android-arm/gdbserver/gdbserver ./libs/armeabi/gdbserver
[armeabi] Gdbsetup       : libs/armeabi/gdb.setup
echo "set solib-search-path ./obj/local/armeabi" > ./libs/armeabi/gdb.setup
echo "directory /home/servo/android/ndk/r12b/android-ndk-r12b/platforms/android-18/arch-arm/usr/include jni /home/servo/android/ndk/r12b/android-ndk-r12b/sources/cxx-stl/system" >> ./libs/armeabi/gdb.setup
[armeabi] Prebuilt       : libmain.so <= jni/armeabi/
cp -f jni/armeabi/libmain.so obj/local/armeabi/libmain.so
[armeabi] Install        : libmain.so => libs/armeabi/libmain.so
install -p ./obj/local/armeabi/libmain.so ./libs/armeabi/libmain.so
/home/servo/android/ndk/r12b/android-ndk-r12b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip --strip-unneeded  ./libs/armeabi/libmain.so
Copying the file "libc++_shared.so" to "/home/servo/buildbot/slave/android/build/target/arm-linux-androideabi/debug/apk/libs/armeabi/libc++_shared.so"
Error while updating the project with the android command
Cleaning up from previous packaging
Packaging Android exited with return value 1

cc @larsbergstrom

@bors-servo
Copy link
Contributor

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

@bors-servo
Copy link
Contributor

💔 Test failed - android

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Apr 13, 2017
@Manishearth
Copy link
Member

@bors-servo are you still there?

@bors-servo
Copy link
Contributor

🍰 Target acquired

@Manishearth
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors-servo
Copy link
Contributor

📌 Commit d0619a7 has been approved by Manishearth

@bors-servo
Copy link
Contributor

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

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

💔 Test failed - android

@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 Apr 13, 2017
@Manishearth
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors-servo
Copy link
Contributor

📌 Commit d0619a7 has been approved by Manishearth

@bors-servo
Copy link
Contributor

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

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

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: Manishearth
Pushing 9d5dde2 to master...

@bors-servo bors-servo merged commit d0619a7 into servo:master Apr 13, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 13, 2017
@wafflespeanut wafflespeanut mentioned this pull request Apr 13, 2017
Merged
3 tasks
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Apr 13, 2017
@emilio
Bug 1341102: Fixup expectations for servo/servo#16384. r=emilio
8151866 
MozReview-Commit-ID: AzvlNohO10v
@canova canova deleted the shape-outside branch April 18, 2017 08:53
Manishearth pushed a commit to Manishearth/gecko-dev that referenced this pull request Apr 21, 2017
@emilio
Bug 1341102: Fixup expectations for servo/servo#16384. r=emilio
6f3e08c 
MozReview-Commit-ID: AzvlNohO10v
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement parsing and serialization of shape-outside property
5 participants
@canova @highfive @bors-servo @Manishearth @jdm