Commit Graph

36 Commits

Author SHA1 Message Date
Simon Sapin
ce39d5cda4 servo: Merge #12319 - Use a stable compiler for build-geckolib (from servo:stable-geckolib); r=larsbergstrom+SimonSapin
<!-- Please describe your changes on the following line: -->

---
<!-- 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 #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because CI already runs `./mach build-geckolib`

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e50e4f99bf4668d183226251d8ea55fa36f72fe0
2016-07-08 16:20:14 -07:00
Bobby Holley
ba2f2c1399 servo: Merge #11886 - Refactor attribute handling to avoid marshalling attributes from Gecko into Servo (from bholley:attr_refactor); r=SimonSapin
This marshaling is slow, because Gecko stores attributes as UTF-16 and does not atomize them in all cases, and it turns out that the need for them in Servo is pretty minimal. With some refactoring across servo and rust-selectors we can fix this.

Source-Repo: https://github.com/servo/servo
Source-Revision: abdf2f28a0bd25a76a31b4fd2410c7a87448ed54
2016-07-05 18:55:36 -07:00
Simon Sapin
a7297026ea servo: Merge #12263 - Make geckolib possible to build on stable Rust (from servo:stable-geckolib); r=nox
<!-- Please describe your changes on the following line: -->

More for https://github.com/servo/servo/issues/11815

r? @nox

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3d557b6f25eb9dbd084cb53bbc9a9cf93bad825b
2016-07-05 15:04:42 -07:00
Anthony Ramine
68261846c3 servo: Merge #11871 - Update Rust to 1.11.0-nightly (ad7fe6521 2016-06-23) (from servo:rustup); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e3e5a51ff692635e7eabd2b244a975686f1064c4
2016-06-27 09:47:34 -05:00
Simon Sapin
993d896521 servo: Merge #11816 - Make the style crate (almost) build with a stable compiler (from servo:stable-style); r=nox
<!-- Please describe your changes on the following line: -->

The bulk of this is adding cargo features to make derived implementations of `heapsize` and `serde` traits optional.

"Almost" because `std::intrinsics::discriminant_value` is currently unstable and doesn’t have any stable replacement that I know of. For now, this PR conditionally replaces it with `unimplemented!()`.

r? @nox

---
<!-- 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 <s>fix</s> are part of #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not <s>require tests</s> *have tests yet* because that requires https://github.com/servo/servo/issues/11806, but I still want to land this before it bitrots. (Tests should check that the build succeeds with a stable compiler.)

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 0fb5d634a007f3d0424f95569ac3f83d500d054c
2016-06-22 09:43:20 -05:00
Keith Yeung
2c8f932ff1 servo: Merge #11799 - Update string_cache to v0.2.20 (from KiChjang:update-string-cache); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: fa0f2898fb8917cff54e07a6bd3ad8730ef10605
2016-06-20 01:29:33 -05:00
Matt Brubeck
db9cf80b67 servo: Merge #11688 - Support keyword values for 'cursor' in geckolib (from mbrubeck:cursor-master); r=emilio
This has a big hard-coded `match` instead of a generated one because Servo's Cursor enum is not generated by Mako code; instead it's in `style_traits` where it can be shared with Servo's gfx and windowing code.

We *could* move this mapping into the macro that generates the Cursor enum, but it would either involve the same amount of code duplication, or make style_traits depend on gecko_bindings. I'm not really sure which is best; open to suggestions.

r? @emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cfef1391f53723aadb3f5225e3eaf3d155002d4
2016-06-09 20:36:54 -05:00
Rahul Sharma
c1289018c9 servo: Merge #11376 - Bump string-cache to 0.2.18 (from creativcoder:update-string-cache); r=nox
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy --faster` does not report any errors
- [X] These changes do not require tests because its a crate version bump.

Source-Repo: https://github.com/servo/servo
Source-Revision: 116faa7617aa2cb648d57307505b23504900bc9f
2016-05-25 10:13:29 -05:00
Matt Brubeck
2b6aab952b servo: Merge #11381 - Make geckolib build dependencies with the same features as Servo by default (from mbrubeck:geckolib-features); r=nox
This reduces the number of things that need to be recompiled when building Geckolib and Servo in the same source tree.

This is a bit fragile and will need to be maintained by hand, but it's a nice improvement for developers.

r? @nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 8876d1f00213207d42089c1282abb8d1b5bef8b6
2016-05-25 01:57:30 -05:00
Keith Yeung
ae05ea6335 servo: Merge #11331 - Update string_cache to 0.2.17 (from KiChjang:update-string-cache); r=nox
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy --faster` does not report any errors
- [x] These changes do not require tests because crate version bump

Source-Repo: https://github.com/servo/servo
Source-Revision: 3c1b8e10c4fb9c200975df41d1c5c071534cf9bd
2016-05-23 07:17:58 -07:00
Bobby Holley
7d70cec87c servo: Merge #11242 - Add basic support for Gecko atoms (from bholley:gecko_atoms); r=emilio
This is a rough initial implementation of gecko atoms. This allows us to get rid of the custom rust-selectors branch we use to build stylo.

The gecko changes are at https://bugzilla.mozilla.org/show_bug.cgi?id=1273771

Source-Repo: https://github.com/servo/servo
Source-Revision: e3be7184fb79d9d0b7b2a491769a58c59a990460
2016-05-18 11:35:28 -07:00
Bobby Holley
dad21c2a95 servo: Merge #11121 - Hoist gecko bindings into their own crate (from bholley:hoist_bindings); r=mbrubeck
This will be helpful for leveraging the bindings with our nsIAtom-backed
string_cache replacement.

Source-Repo: https://github.com/servo/servo
Source-Revision: 49fd06089de8357c0d139f6aa623cde55ccd9ef0

--HG--
rename : servo/ports/geckolib/bindings.rs => servo/ports/geckolib/gecko_bindings/bindings.rs
rename : servo/ports/geckolib/gecko_style_structs.rs => servo/ports/geckolib/gecko_bindings/structs.rs
rename : servo/ports/geckolib/tools/.gitignore => servo/ports/geckolib/gecko_bindings/tools/.gitignore
rename : servo/ports/geckolib/tools/README.md => servo/ports/geckolib/gecko_bindings/tools/README.md
rename : servo/ports/geckolib/tools/regen_style_structs.sh => servo/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh
rename : servo/ports/geckolib/tools/setup_bindgen.sh => servo/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh
2016-05-11 14:59:04 -07:00
Matt Brubeck
ae38180d6b servo: Merge #11122 - Use the same build environment and features for CEF, Servo, Gonk, Geckolib (from mbrubeck:unify-builds); r=larsbergstrom
* Remove unnecessary dependencies and features from top-level Cargo.tomls.  The features for each crate will be computed based on the union of features specified in the dependency graph.  Specifying the same ones again just adds more ways for them to get out of sync.
* Move all cargo build environment variables into CommandBase

Fixes #11112. r? @metajack

(Not included: CI test to make sure #11112 doesn't regress again.)

Source-Repo: https://github.com/servo/servo
Source-Revision: 7f76e3ba74a11f1f4bb46f12e17c06270175908f
2016-05-11 12:35:32 -07:00
Bobby Holley
0b3556454c servo: Merge #10998 - Geckolib: implement font-weight and logging support (from bholley:font_weight_and_logging); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: ec5f826d18adabbb0cf8d07b879b616dc5caa1aa
2016-05-04 18:37:26 -07:00
Matt Brubeck
ffeadc8422 servo: Merge #10975 - Update even more dependencies (from mbrubeck:more-deps); r=KiChjang
Adds a temporary exception to allow multiple versions of lazy_static. PRs have already been filed on the packages that are still using the old version.

Source-Repo: https://github.com/servo/servo
Source-Revision: 361b2b900eeea821a9a79d8566f8cd31dfb1b1ea
2016-05-02 16:48:45 -07:00
Matt Brubeck
ff8a4f5c36 servo: Merge #10944 - Upgrade a bunch of dependencies (from mbrubeck:bitflags-0.6); r=frewsxcv
Source-Repo: https://github.com/servo/servo
Source-Revision: 8db0367301b5ad5ab5ea4704d57755c166cfd5de
2016-04-30 15:21:22 -07:00
Simon Sapin
2f882b0cfb servo: Merge #10857 - Simplify TOML syntax (from servo:toml); r=nox
* Sections like `[dependencies.foo]` can be entries in a `[dependencies]` section with the `{key = value}` syntax.
* Per-target dependencies can be expressed with more general `cfg(…)` conditions instead of exact target triples: https://github.com/rust-lang/cargo/pull/2328

Source-Repo: https://github.com/servo/servo
Source-Revision: 2729864af73d62719ea0fd55cef417c43bdd951e
2016-04-26 15:46:37 -07:00
Simon Sapin
15f5299fe5 servo: Merge #9840 - Update to rust-url 1.0 (from servo:url-1.0); r=asajeffrey
**Do not merge yet:** rust-url 1.0 is not published yet and may still get breaking changes. The goal of this PR for now is to demonstrate API usage.

Depends on:

* <s>https://github.com/servo/rust-url/pull/176</s>
* <s>https://github.com/alexcrichton/cookie-rs/pull/42</s>
* <s>https://github.com/hyperium/hyper/pull/740</s>
* https://github.com/cyderize/rust-websocket/pull/70
* https://github.com/jgraham/webdriver-rust/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 84ab7e9fe8f4a6528995eff3eb6e814cb724c364
2016-04-23 11:28:31 -07:00
Per Lundberg
fb40602db9 servo: Merge #10488 - Removed the T prefix for the style traits (from perlun:remove-t-prefix-on-style-structs); r=SimonSapin
More work as described in #10185.

I am getting _extremely_ weird compile-time errors with this one, when it's trying to expand the `lazy_static!` macro. I think I'll need help getting that part sorted out. The rest should be pretty OK.

Anyone has ideas on how to resolve it?

Source-Repo: https://github.com/servo/servo
Source-Revision: a4991f536cb60b70309358cbb4da46dfbe412b3d
2016-04-13 01:55:25 +05:01
Arnaud Marant
1257225e1e servo: Merge #10505 - Issue #10491 add HTMLInputElement attributes that reflect content ide… (from amarant:10491-HTMLInputElement-attr); r=KiChjang
…ntically

it uses a new version of string-cache https://github.com/servo/string-cache/pull/148

Source-Repo: https://github.com/servo/servo
Source-Revision: 61865f66b515503971146b472ae0f8b747569fd0
2016-04-12 05:29:16 +05:01
Bobby Holley
2d2535a7c8 servo: Merge #10461 - Add some machinery to allow us to disable CSS properties/values per-product (from bholley:per_product); r=SimonSapin
Here's an initial stab at solving the issues @SimonSapin brought up in #10408.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2491af84fc8e95e4e5741e6fc12db4275527aaba
2016-04-08 18:27:43 +05:01
Bobby Holley
6e1def963d servo: Merge #10155 - Generalize the style structs (from bholley:generalize_style_structs); r=SimonSapin
This allows geckolib to pass gecko style structs and have the style system write to them directly, provided we implement all the traits.

Source-Repo: https://github.com/servo/servo
Source-Revision: 605842f193aedc1151ab38a99c49f693c76e5cf3
2016-03-25 02:58:33 +05:01
Ms2ger
41fe5c1c3e servo: Merge #10076 - Update to Rust 2016-03-18 (from servo:rustup); r=larsbergstrom,manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: aa35d7721b0e1e7893e48af1eb91bf8ad2495d46
2016-03-20 14:07:17 +05:01
Anthony Ramine
ace9b5c608 servo: Merge #10055 - Bump serde to 0.7 (from servo:serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 7a9dc577617b442ff0fe07eaa683207234c519ee
2016-03-17 17:58:36 +05:01
Anthony Ramine
3ba3376dfd servo: Merge #9943 - Preliminary bumps for bumping Serde (from servo:serde-preliminaries); r=jdm
We need to bump webrender before being able to bump Serde, but we also needs these bumps, so let's include them ASAP first because bumping a lot of things is always a pain.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f526054ebfa164ca2545d881b8392a744af7870
2016-03-10 00:21:36 +05:01
Anthony Ramine
d20617d135 servo: Merge #9886 - Make Cargo share more things between servo and ports (from nox:unstable-feature); r=SimonSapin
This should enable Cargo to reuse more build artifacts between servo and geckolib.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5fbed88248069f1943399d28885249ee0adc89b2
2016-03-08 19:34:24 +05:01
Anthony Ramine
69b87ee72d servo: Merge #9742 - Make use of From<String> for Atom (from nox:atom-from-string); r=ecoal95
Source-Repo: https://github.com/servo/servo
Source-Revision: b3b6f092062eed2f323da88991553d0285da6a16
2016-02-25 08:10:44 +05:01
Emilio Cobos Álvarez
b1dd4fcd79 servo: Merge #9567 - style: Make the whole style crate independent of the implementation (from emilio:general-pseudo-element-parsing); r=bholley,SimonSapin
This allows, among other things, having different implementations for parsing pseudo{elements, classes} in both `ports/geckolib` and in servo.

Source-Repo: https://github.com/servo/servo
Source-Revision: c11844cbf28054784c8d65781cff20045d8ee48b
2016-02-14 03:30:59 +05:01
Anthony Ramine
c0e4adbd32 servo: Merge #9622 - Bump heapsize to 0.3 (from nox:heapsize); r=ecoal95
Source-Repo: https://github.com/servo/servo
Source-Revision: a164176876bb6abccf729eb5d6334e3c22230103
2016-02-13 18:21:41 +05:01
Anthony Ramine
08f5c3da70 servo: Merge #9532 - Say farewell to in-tree HeapSizeOf (from nox:dedup-heapsize); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 2a6707ce58df27d93e865bffb6b44d396b810c99
2016-02-05 03:11:36 +05:01
Ms2ger
2eaac7c861 servo: Merge #9519 - Update Euclid (from Ms2ger:euclid); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 712b053f4f597a097767a0812013b95c7db8b3c9
2016-02-04 16:06:48 +05:01
Keith Yeung
5f946e83b6 servo: Merge #9498 - Update rust-url (from KiChjang:update-url); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 64ad9e17d9323862833daa60290b037ea8334424
2016-02-03 11:09:51 +05:01
Emilio Cobos Álvarez
83aa64a599 servo: Merge #9510 - Update rust-selectors (from nox:bump-selectors); r=SimonSapin
This commits updates rust-selectors to use the generic parser, and as
such it moves the element state into the style crate.

Source-Repo: https://github.com/servo/servo
Source-Revision: ae20f2556bc7807b39b6649ac1f738644abcc26a
2016-02-03 06:35:11 +05:01
Simon Sapin
ec5662344b servo: Merge #9380 - Update cssparser (from servo:cssparserup); r=SimonSapin
https://github.com/servo/rust-cssparser/pull/91

Source-Repo: https://github.com/servo/servo
Source-Revision: 1ba1fb0b7f46472e1f37f4e3f2e7dde025fa9f1f
2016-01-21 22:16:51 +05:01
Bobby Holley
2379681f6b servo: Merge #9284 - Add Partial Implementation of style DOM traits for Gecko, and some basic glue to let Gecko call into Servo (from bholley:bootstrap_stylo); r=SimonSapin
The wrapper stuff is partially-complete, modulo some unimplemented methods. The glue code is just a toy for now. Regardless, I think it's worth getting some of this stuff in-tree to minimize breakage.

Source-Repo: https://github.com/servo/servo
Source-Revision: 77d3fbcca3c6f7e8b4068f89e25b090977fe5672
2016-01-19 13:50:10 +05:01
Bobby Holley
561a84a40d servo: Merge #9209 - Implement a geckolib target (from bholley:geckolib); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: aa713c9fbb56fd3f1427779bb31ec48dee316187

--HG--
rename : servo/tests/unit/net_traits/lib.rs => servo/ports/geckolib/lib.rs
2016-01-10 06:45:17 +05:01