Auto merge of #13372 - Manishearth:merge-stylo, r=emilio

Merge most of geckolib into style

Fixes #13038

r? @emilio

<!-- 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/13372)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-26 02:36:05 -05:00 committed by GitHub
commit f763eca344
45 changed files with 2712 additions and 2763 deletions

View file

@ -12,6 +12,5 @@ doctest = false
[dependencies]
app_units = "0.3"
cssparser = {version = "0.7", features = ["heap_size"]}
gecko_bindings = {path = "../../../ports/geckolib/gecko_bindings"}
style = {path = "../../../components/style", features = ["gecko"]}
style_traits = {path = "../../../components/style_traits"}