Commit Graph

528 Commits

Author SHA1 Message Date
Simon Sapin
a6f7082122 servo: Merge #19128 - Upgrade to rustc 1.23.0-nightly (02004ef78 2017-11-08) (from servo:asciiext); r=nox
This fixes some new warnings, some of which (in `style`) are treated as errors. See https://users.rust-lang.org/t/psa-dealing-with-warning-unused-import-std-ascii-asciiext-in-today-s-nightly/13726

Source-Repo: https://github.com/servo/servo
Source-Revision: c46c9dc019ffe5447297140c22cd8b6ee95a9f5f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 49e4a180cd0d8ecdd48cd6896dc16b580f564e10
2017-11-09 10:00:38 -06:00
Keith Yeung
3e30a1685e servo: Merge #18871 - Merge functionality of WebsocketConnect into Fetch (from KiChjang:websocket-fetch-integration); r=avadacatavra
Partial #14897.

Source-Repo: https://github.com/servo/servo
Source-Revision: a69e33366e4333f1de3502e5d706d79f4f843b00

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cb1f2f6a16183af75be82d43912d0a920a38308a
2017-10-25 09:00:41 -05:00
Keith Yeung
39f9d6ab41 servo: Merge #18981 - Merge request type and destination (from KiChjang:fold-type-destination); r=avadacatavra
Fixes #18278.

Source-Repo: https://github.com/servo/servo
Source-Revision: dcd7d2fa32aa53628a9be63a2d0ea64796cd968e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : fe27e3095659b41b38bd08b74966c507666bbe5d
2017-10-24 17:02:18 -05:00
Matt Brubeck
aca60f24b9 servo: Merge #18968 - Use try syntax for Option where appropriate (from mbrubeck:try); r=emilio
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are refactoring only

Source-Repo: https://github.com/servo/servo
Source-Revision: 2b03a9974c61d1481d4b40351ff1305ad0b26588

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ff1d2ee734428d0ff4590fcf8dd03de2bc2302b6
2017-10-21 03:31:21 -05:00
Nicholas Nethercote
5a62942911 servo: Merge #18938 - Replace all uses of the heapsize crate with malloc_size_of (from nnethercote:bug-1409255); r=SimonSapin
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`.
`malloc_size_of` is better -- it handles various cases that `heapsize` does not
-- so this patch changes Servo to use `malloc_size_of`.

This patch makes the following changes to the `malloc_size_of` crate.

- Adds `MallocSizeOf` trait implementations for numerous types, some built-in
  (e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`).

- Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't
  support that operation.

- For `HashSet`/`HashMap`, falls back to a computed estimate when
  `enclosing_size_of_op` isn't available.

- Adds an extern "C" `malloc_size_of` function that does the actual heap
  measurement; this is based on the same functions from the `heapsize` crate.

This patch makes the following changes elsewhere.

- Converts all the uses of `heapsize` to instead use `malloc_size_of`.

- Disables the "heapsize"/"heap_size" feature for the external crates that
  provide it.

- Removes the `HeapSizeOf` implementation from `hashglobe`.

- Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of`
  doesn't derive those types, unlike `heapsize`.

<!-- 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
- [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because testing is on the Gecko side.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
2017-10-18 13:56:05 -05:00
Matt Brubeck
aae71ef096 servo: Merge #18924 - Fix commonmark Markdown warnings in docs, part 1 (from mbrubeck:doc); r=Manishearth
Fixes warnings from rust-lang/rust#44229 when `--enable-commonmark` is passed to rustdoc.

This is mostly a global find-and-replace for bare URIs on lines by themselves in doc comments.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are doc formatting changes only

Source-Repo: https://github.com/servo/servo
Source-Revision: 0e62a5829b7c29ae2667a21a439aff1e89201bf3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a3cb4b6d3c62220f728cae0ab3bc603fa403ba8b
2017-10-17 16:04:10 -05:00
Glenn Watson
a099f50bcc servo: Merge #18890 - Update WR (details below): (from glennw:update-wr-clip-text-aa); r=jdm
* Add support for clip masks on text runs.
* Fix atomic ordering of items with multiple shadows.
* Update to bincode + ipc-channel with optimizations.
* Fix some plane splitting precision errors.
* Improve the anti-aliasing quality significantly.
* Add internal ClipChain support.
* Fix diacritic glyphs on Linux.

Source-Repo: https://github.com/servo/servo
Source-Revision: d3d2b0261a8aacd4f74e330f8c007a91f829a96e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7e4b2cb3c1826baf96fbd87667ed36f872c8e282
2017-10-16 12:54:02 -05:00
Simon Sapin
610a77ac31 servo: Merge #18839 - Remove some usage of unstable features (from servo:stabler); r=nox
`Box::new(x)` seems to compile to exactly the same assembly as `box x` in release mode:
https://play.rust-lang.org/?gist=55ec5dd02c22fa799375d6e2e1a6e970&version=nightly

Source-Repo: https://github.com/servo/servo
Source-Revision: fc4de5adf5bff7fabe9f32b960c405f249b5d035

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 029931b3a8d9c2e073038623375ebbc38eba348a
2017-10-12 05:18:00 -05:00
Bastien Orivel
e7a4a89a25 servo: Merge #18743 - Bump base64 to 0.6 (from Eijebong:base64); r=jdm
This allows us to update hyper to 0.10.13 (closer to 0.11)

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they're just a version bump

Source-Repo: https://github.com/servo/servo
Source-Revision: f3191db2b19a4475382b594a5bf0cec4b990a8c1

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2b344b49ece0f66597ed4bd3de4453de216c758f
2017-10-05 19:37:30 -05:00
Simon Sapin
b5383eadfb servo: Merge #18576 - Update some dependencies to fix some warnings (from servo:warn); r=nox
"`#[must_use]` on methods is experimental" and "trait bounds are not (yet) enforced in type definitions" are shown despite Cargo using `--cap-lints=allow` for dependencies.

Source-Repo: https://github.com/servo/servo
Source-Revision: 98e3bb3cddb1c2e91b1f265269668e11843758fa

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b1eefcf731743f295070bba26fd1988ce0a06e21
2017-09-20 07:49:42 -05:00
Clément DAVID
14926dcf7c servo: Merge #18179 - Automatically verify that derive() lists are alphabetically ordered #… (from davidcl:master); r=jdm
<!-- Please describe your changes on the following line: -->
Automatically verify that derive() lists are alphabetically ordered #18172

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

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

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 474369618965569407d127b1e8c481e757cc59d3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 421aa68def8e17f70580477a4203494db3b69382
2017-08-23 17:18:31 -05:00
Keith Yeung
de7fb37c6f servo: Merge #17521 - Update fetch methods (from KiChjang:update-fetch); r=jdm
Includes updates to main fetch, scheme fetch, HTTP fetch, HTTP-redirect fetch, HTTP-network fetch, HTTP-network-or-cache fetch and CORS preflight fetch.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9f64630eaa5731db10b113ce0a2b967dbc4de15a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 94e544809f1371d40faca9aaf6522e2434621fae
2017-08-18 18:39:02 -05:00
Simon Sapin
ea9c8db790 servo: Merge #18046 - Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10) (from servo:rustup); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 7d9b82b9efa7b10a2e34d93df5ac535d99518f7a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e1b3d113c3edaea3c4c07f8b206f2e02922e3caf
2017-08-15 07:31:04 -05:00
Glenn Watson
60b7df739c servo: Merge #18002 - Update WR (text optimizations, Linux subpixel positioning / rasterization) (from glennw:update-wr-linux-subpx); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 31582a487437f599005bb96bf94a1942b8e46d24

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 99de154135f2cea70619c0400e1c0e1fdb05f68c
2017-08-08 16:05:54 -05:00
Corey Farwell
08f1519744 servo: Merge #17883 - Audit usages of unicode case-changing methods (from frewsxcv:frewsxcxv-lowercase); r=SimonSapin
Part of https://github.com/servo/servo/issues/17777.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5fff90c73f77dd9ed41b692e6b3ea960a29ee8a8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4dc82b9feba039e3f300ec5884d04ecab21f13e9
2017-08-02 03:01:26 -05:00
Fausto Núñez Alberro
7e1c3e7d13 servo: Merge #16508 - Properly set origin of fetch requests (from brainlessdeveloper:fetch-set-origin); r=asajeffrey
<!-- Please describe your changes on the following line: -->

These changes aim to fix #15247

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

<!-- Either: -->
- [ ] There are tests for these changes
- [x] These changes do not require tests because cors is already tested with different origins

These changes require changes in tests, but I need help with that (see comments below).

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 2bb4f65100ca07e9281c8ad04cd498ff1346387f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : bbe08d6bb565dc0f8159c96caca5f18492a8ac2c
2017-07-17 08:29:23 -07:00
Martin Robinson
d42609fdf5 servo: Merge #17694 - Upgrade to the latest version of WebRender (from glennw:webrender-update); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 173181a491f18a292ea80acbc25dd561e6e678d8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e76e3e725e124e01505676aedcf0d8f6e7d67971
2017-07-12 21:52:27 -07:00
Clar Charr
29fdb2552a servo: Merge #17619 - Update parse-hosts (from clarcharr:master); r=SimonSapin
The `parse-hosts` crate was recently updated so that it doesn't use any unstable features.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because tests were already implemented.

Source-Repo: https://github.com/servo/servo
Source-Revision: eec51cdd575cf985bc1ed926c6cb8868f1ba0e0e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 08af8149867cf8aca7947e786b0962261d80e1dc
2017-07-06 23:34:13 -07:00
Keith Yeung
d17a0f794c servo: Merge #17491 - Introduce service-worker mode (from KiChjang:update-fetch); r=jdm
Bringing in the spec changes from whatwg/fetch#435.

Source-Repo: https://github.com/servo/servo
Source-Revision: e2a26e7bd0d8089a441bc3072cf15351b0ef1252

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 05549195b43020dcd02768bcd79cef5f7ed4b813
2017-06-23 14:56:00 -07:00
Simon Sapin
f2e4fa0a56 servo: Merge #17390 - Untry (from servo:untry); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 568ab550053fddf346806ed6cc2d3bfe37f3e1d0

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2d258d6f281ff628b88311d2f4523bed29e60ff3
2017-06-18 05:55:11 -07:00
Simon Sapin
817c7746be servo: Merge #17355 - Bump serde to 1.0 (from servo:serdeup); r=nox
This is a rebase of #17325 with `[replace]` entries removed, a bunch more dependencies updated, and some more compile fixes. Original work by @Eijebong, thanks a lot!

Source-Repo: https://github.com/servo/servo
Source-Revision: 66c130d55aa0d7af1104c00e93a5bf950f23a383

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 323361580a540d8b296f6f7d77f20d46cbdc5c73
2017-06-16 05:03:18 -07:00
Glenn Watson
2865a9e008 servo: Merge #17352 - Update WR (CPU text optimizations, image format renames) (from glennw:update-wr-faster-text); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: e1bce241291683ee61abab042d0c808ae5396e91

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 38f0d8ec39b0377ce568d0877e0939fafe27d0d1
2017-06-16 01:21:05 -07:00
Anthony Ramine
1771af7b85 servo: Merge #17149 - Update Rust nightly (from servo:rustup); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 9656341f43cc1bc415e07a0a0c919740280ad2ab

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 828f413975924753ab1370d64a824a7744a0733f
2017-06-09 02:41:16 -07:00
Alan Jeffrey
3e7932d6cd servo: Merge #17150 - Implemented the plumbing for paint worklets (from asajeffrey:script-paint-worklets-plumbing); r=jdm
<!-- Please describe your changes on the following line: -->

This PR implements the plumbing for paint worklets:

* Adding CSS values for paint worklets.
* Implementing a skeleton for the `PaintWorkletGlobalScope` webidl.
* Implementing an executor for paint worklet tasks, and passing it from script to layout.
* Building the display list items for paint worklet images.

This PR does not implement registering or calling paint worklets in JS.

Before it merges, this PR needs a reftest added for basic paint worklet functionality.

---
<!-- 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
- [ ] There are tests for these changes

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: bf46da065db58549a74c489d521f9375f4137637

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b47a030eba91b992b1c0dac50ea3eb49a288ca39
2017-06-07 11:57:07 -07:00
Josh Matthews
9da526778d servo: Merge #17169 - Read 32kb from the network at a time (from servo:jdm-patch-2); r=SimonSapin
Now that https://github.com/servo/servo/pull/16989 has merged, this might actually work.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6fe0e30c169b54eb711ca1ee2dc1cdbf0ef83e82

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b9986d202edf296fbaa81a64143fcaba2dfddc8d
2017-06-05 18:18:30 -07:00
Anthony Ramine
7750f83ef2 servo: Revert "Update Rust nightly to 1.19.0-nightly (6165203c4 2017-06-03)"
This reverts commit f081380dc03dba9664877df2829097f32c40694a.

Source-Repo: https://github.com/servo/servo
Source-Revision: 56c961af5ab47cb314655e5e5cfaecdf1ddcff21

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e87a0eddbcfc53c630ada3ebeaa9910e5958ace6
2017-06-03 14:37:17 +02:00
Anthony Ramine
c4bb5225e7 servo: Update Rust nightly to 1.19.0-nightly (6165203c4 2017-06-03)
Source-Repo: https://github.com/servo/servo
Source-Revision: f081380dc03dba9664877df2829097f32c40694a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f513aeefe4b875e509cc1a2d895a5a246a552b4c
2017-06-03 13:27:19 +02:00
Nikhil Shagrithaya
27e2ef2b43 servo: Merge #15354 - Redirect document loads manually (from cynicaldevil:manual-redirect); r=jdm
<!-- 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 #14596 .

r? @jdm

I ran some tests at random from the `navigating-across-documents` folder, and they are passing.

<!-- 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: eac4f407e2bfa0055a698ca438972566f0814e43

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 68436f4afccd0313c5d1a0da4e0bbb72106284f5
2017-06-02 14:49:21 -07:00
Matt Brubeck
a71bb5f866 servo: Merge #17042 - Update dependencies (from mbrubeck:always-be-updating); r=jdm
No Cargo.toml changes except `base64` which is updated from 0.4.2 to 0.5.2.  Does not affect stylo.  No new crates in the dependency graph.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f5ccdb589f484e17908811173893abc2ac8ff04

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cb0b3486ed513099879fe7303766ad75def4ab8f
2017-05-26 12:18:12 -05:00
SendilKumar N
92c02c5452 servo: Merge #16913 - Make canvas origin clean checks use origin of image response (from jdm:canvas2d); r=jdm
Adapted from #15887.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15409
- [X] There are tests for these changes

Source-Repo: https://github.com/servo/servo
Source-Revision: 62690887c163332688add2b1e62bb4c12b2e7df4

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4103a8f020691ef300e5651cb8da59bf61b42c69
2017-05-19 10:45:44 -05:00
Fabrice Desré
b912f951ac servo: Merge #16869 - Ignore mime type parameters in nosniff (fixes #16049) (from nox:mime); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: f3c8f7e0d0fb42f32e3699d07fc0f8002bf564c8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d7ddf463cc31fc89f0d289b5739767e2ffff1de7
2017-05-15 10:15:37 -05:00
Ksbugbee
49c524ca20 servo: Merge #16761 - Use hash2 instead of deprecated hash (from Ksbugbee:master); r=jdm
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

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

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 4e3544f05c161039b97fe4c20daca4a0baf372fe

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c7f59de471905adb648376cc3eb2e1183bc97d80
2017-05-08 13:42:32 -05:00
Alice Maz
c0292d3464 servo: Merge #16706 - Bump base64 to 0.4.2 (from alicemaz:master); r=nox
<!-- Please describe your changes on the following line: -->
we have just released a security patch for base64 (preventing integer overflow when sizing a buffer for encoded output). this bumps the version in the three Cargo.toml files that pull it in. there should be no observable difference in behavior, no non-malicious input should be able to trigger this state

---
<!-- 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 it is a small fix to a dependency with no practical difference in operation from previous.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 6aa552d59f21644ed93b17b1cec4197cd354b882

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d5d59c0fff40d88c12de844ab50cc0f9249f46ab
2017-05-04 06:08:37 -05:00
coalman
3fa74a14ad servo: Merge #16495 - Make tidy check that opening and closing braces that begin a line do … (from coalman:tidy-brace-alignment); r=emilio
…so with proper alignment.

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

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

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 195100f3cac99b979e25157eb437e63bd3262e6f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1f340388b3b70f620cbfba6d216955d3ef23b7cb
2017-04-19 03:06:31 -05:00
Glenn Watson
b254d008cd servo: Merge #16502 - Update WR (IPC profiling, RG8 image support) (from glennw:update-wr-ipc); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 56435db820ad13d7fcb9acf9ce4fa84667234706

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5f2d5a0dbb8c32ee2d18cd77fb640c9f8ec83ee6
2017-04-17 17:18:23 -05:00
Josh Matthews
ec33055ad9 servo: Merge #16489 - Show HTTP response headers in debug output (from jdm:http-response); r=asajeffrey
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are changing informative debug output.

Source-Repo: https://github.com/servo/servo
Source-Revision: 86aa4e89c53fbf80f70fa3622cba2140b42a3b35

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 77df6d5d07e4c423f3509985ab2a89a08ad2bf33
2017-04-17 11:30:29 -05:00
Anthony Ramine
f2aa5b85ae servo: Merge #16311 - Do not return an error for non-GET data: requests (fixes #13293) (from nox:data-method); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: 3a5ed1797f8db21b5d90c90c509b16f0535691a8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 30c704c85b36df4d6db2d4c3baa6c7ec8c52ff8a
2017-04-08 23:17:26 -05:00
Anthony Ramine
2be3fb9f63 servo: Merge #16288 - Kill ResourceGroup (from nox:net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8f2ceb41dd1a039f1d0150dcb1c4e2ba6b22afa2

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0d96c40cf493fe9ae2635124b0ddced23f02f429
2017-04-07 05:53:31 -05:00
Josh Matthews
3e783d5156 servo: Merge #15784 - Make SSL tests work (from jdm:ssltests); r=nox,jgraham
These changes fix #6919.

Source-Repo: https://github.com/servo/servo
Source-Revision: f3fd8238ce1f7b2eb74d4fccbe76cfac8aa2335a

--HG--
rename : servo/components/net_traits/hosts.rs => servo/components/net/hosts.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e60490550b246691c170ea0b0c856db33b7dbf61
2017-04-06 05:53:14 -05:00
Anthony Ramine
d07fe9c96c servo: Merge #16272 - Net enhancements (from nox:net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bf7c044955ecfb8e074699e278994a08c22109fa

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 38adb3565f19dc69db81b68da83e7a9543872f60
2017-04-05 09:27:55 -05:00
Josh Matthews
2af51dd331 servo: Merge #16262 - Enable HTTP connection pooling (from jdm:connection-pool); r=nox
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15694
- [X] There are tests for these changes

Source-Repo: https://github.com/servo/servo
Source-Revision: c2f3cf020531f6fcf05b164ca699cd827114136c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 35293522128d1b1c17455c0ac7e52c8bf13f3f2e
2017-04-05 08:09:23 -05:00
Fernando Jiménez Moreno
8676adc86e servo: Merge #16126 - Block scripts with text/csv, audio/*, video/* and image/* mime types (from ferjm:issue-14520-block-media-csv); r=nox
This patch implements step 12 of the Main Fetch section of the Fetch API standard. It blocks the load of scripts with `text/csv`, `audio/*`, `video/*` and `image/*` mime types.

Credit for the logic of `should_block_mime_type` function should go to the author of #14770.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14520
- [X] There are tests for these changes

Source-Repo: https://github.com/servo/servo
Source-Revision: 1071c3339fd858014382b4e9938584279555b5ec

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c033d8126b32e2b64be0d9f774f9e6ddbf6af6b9
2017-04-05 02:34:27 -05:00
Anthony Ramine
a2d15cb416 servo: Merge #16256 - Another batch of net enhancements 🕶 (from nox:net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 5421d833de30e0c963bc6241120263897d4fc68c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 62209e773b8b51c7a12a413a79b7b0d415a8b98e
2017-04-04 06:25:33 -05:00
Anthony Ramine
bbe4640235 servo: Merge #16245 - Don't share the SSL client between the private and public groups (from nox:ssl); r=avadacatavra
Source-Repo: https://github.com/servo/servo
Source-Revision: e8ed3e0b7f5fefffa7fa8c73846bdcb6673bf36e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f91c702f9d6f5406ce38c4d212204452fcfdfb00
2017-04-03 12:07:27 -05:00
Anthony Ramine
1b58156c83 servo: Merge #16214 - Improve the net crate (from nox:net); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: c31ee6e300d9c0eb1e5671abba14f0584a910460

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ea9c5bde3dfeeb87b069f84846628c5b3a8a1de2
2017-04-03 07:47:38 -05:00
Anthony Ramine
b6e22d3c65 servo: Merge #16230 - Introduce create_ssl_client (from nox:ssl); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2df6e26fd726cded0e4f91ebd92e47669ffcc940

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4c567dfd74183d32b6756834470805a2839a5617
2017-04-02 09:12:44 -05:00
Josh Matthews
4017bdaf16 servo: Merge #16225 - Disable HTTP connection pooling (from jdm:revertpooling); r=KiChjang
The intermittent failures in the nosniff tests appeared once more after #16209 merged, so we should disable this again.

Source-Repo: https://github.com/servo/servo
Source-Revision: dc3765e231441b006f17c9aa4588e7f166bba45e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f85ecdb6c691fd74af5cd3f5e4312be46b68dc96
2017-04-01 17:32:24 -05:00
Anthony Ramine
c0e4abfe73 servo: Merge #16209 - Enable HTTP pooling again (fixes #15694) (from nox:net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 325713af3877eb7c51745e7b626952f5d74dc76f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 3070a131b5575c344671b2bc5bbef4ccee246174
2017-03-31 17:56:11 -05:00
ddh
b6b120e23d servo: Merge #15868 - Update Hyper and OpenSSL (from servo:hyper); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 82b0d5ad54d94a29f595d59cbb37dcbab5d5a5c8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cda703ae221b029588bdb549a69b150e1397ca3a
2017-03-31 11:46:09 -05:00
Fernando Jiménez Moreno
02a67f151b servo: Merge #16156 - Update http_network_or_cache_fetch according to spec (from ferjm:issue-16130-http-network-or-cache-fetch); r=jdm
There are still many steps blocked by the absence of an HTTP cache and the inability to trigger a credentials dialog.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #16130

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f9dbcc8080e5763553d316261e2d158c19ce6f1

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6ec4952d1393e06f98ca1f1cae413267c2d389c2
2017-03-29 19:38:45 -05:00