Commit Graph

53 Commits

Author SHA1 Message Date
Prabhjyot Singh Sodhi
6dfb43672b servo: Merge #7470 - implemented a pass-through mark_as_root for FlexFlow (from psdh:flexflow); r=pcwalton
Fixes #7467

Source-Repo: https://github.com/servo/servo
Source-Revision: 23d1416cc23d1fb11741a17de17cf79e7591de2b
2015-08-31 18:28:14 -06:00
Paul Rouget
28021e56e2 servo: Merge #7331 - prevent division by 0 (from paulrouget:issue-7316); r=SimonSapin
Fix #7316

Source-Repo: https://github.com/servo/servo
Source-Revision: 524b02dbf7c2d8ef0d3a453124075f7718f7e458
2015-08-24 05:08:41 -06:00
Patrick Walton
faf0032ca9 servo: Merge #7312 - Initial (very rudimentary) flexbox implementation (from servo:flex-experimental); r=SimonSapin
This is #7154 with two additional commits (that I did rather than ask @zentner-kyle to do it because it was a bit tricky.)

r? @pcwalton for the last two commit

r=me+pcwalton in #7154 for earlier commits.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5e83a3f0a3bab226cca849ab33fa3322ef71813d
2015-08-21 17:19:20 -06:00