Граф коммитов

6 Коммитов

Автор SHA1 Сообщение Дата
Anthony Ramine c3603de9fc servo: Merge #16013 - Enable the debugger on Android (from nox:mio); r=larsbergstrom
Apparently mio 0.6.5 now fully supports Android.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 361bc658e4f6054dddccf0fcf47f658e0a11cb4b
2017-03-17 08:36:27 -07:00
Anthony Ramine 0983af50c8 servo: Merge #15743 - Update ws to 0.6 (from nox:ws); r=emilio
This is exactly the same as 0.5.4, but without a semver violation.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ab1ef887c70a398db1f64486cb09c01e01f9e2c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4317792bf6ee139146a7b3c467ec9e99d29e8677
2017-02-26 06:26:05 -08:00
Alan Jeffrey 07258edab3 servo: Merge #14592 - Remove the util crate (from asajeffrey:util-goodbye); r=mbrubeck
<!-- Please describe your changes on the following line: -->

This PR removes the `util` crate.

* Replaced the `spawn_named` and `clamp` functions by appropriate uses of `std:🧵:Builder::spawn`, `std::cmp::min` and `std::cmp::max`.
* Moved `opts`, `prefs` and `resource_files` into a new `config` crate.
* Moved `remutex` and `geometry` into their own crates.

---
<!-- 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 do not require tests because they are refactorings

<!-- 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: 4eb653817f87e5fb47de34356f558eb76ecbca9f

--HG--
rename : servo/components/util/Cargo.toml => servo/components/config/Cargo.toml
rename : servo/components/util/basedir.rs => servo/components/config/basedir.rs
rename : servo/components/util/lib.rs => servo/components/config/lib.rs
rename : servo/components/util/opts.rs => servo/components/config/opts.rs
rename : servo/components/util/prefs.rs => servo/components/config/prefs.rs
rename : servo/components/util/resource_files.rs => servo/components/config/resource_files.rs
rename : servo/components/util/geometry.rs => servo/components/geometry/lib.rs
rename : servo/components/util/remutex.rs => servo/components/remutex/lib.rs
rename : servo/tests/unit/util/lib.rs => servo/tests/unit/servo_config/lib.rs
rename : servo/tests/unit/util/opts.rs => servo/tests/unit/servo_config/opts.rs
rename : servo/tests/unit/util/prefs.rs => servo/tests/unit/servo_config/prefs.rs
rename : servo/tests/unit/util/remutex.rs => servo/tests/unit/servo_remutex/lib.rs
2016-12-14 16:48:42 -08:00
Lars Bergstrom cb579073d3 servo: Merge #14270 - Disable the debugger on Android until mio works on Android (from larsbergstrom:disable_android_debugger); r=nox
<!-- Please describe your changes on the following line: -->
r? @nox

The recent change to `ws-rs` introduced a dependency on `mio`, which depends on `nix`, which does not build on Android (https://github.com/nix-rust/nix/issues/313). I've disabled the debugger in this change.

Fixes #14171

cc @mmatyas

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./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 _____

<!-- 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: 9c6f6ebf3e789c251f34d865a4a713988ba81cdb
2016-11-18 23:40:20 -06:00
Eddy Bruel 8ccd0522b4 servo: Merge #14110 - Replace rust-websocket with ws-rs in the debugger server (from servo:ejpbruel-ws); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 04e2af0b222de22782c29eb0a20622e5717cd574
2016-11-07 12:47:58 -06:00
Eddy Bruel 41df45bd18 servo: Merge #13204 - Implement a WebSocket server for debugging (from ejpbruel:debugger); r=jdm
<!-- Please describe your changes on the following line: -->

This pull request adds a very simple WebSocket server to Servo, that we intend to use for debugging. It currently only echoes back messages, but eventually we want this server to implement the Chrome Debugging Protocol.

---
<!-- 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 this is a prototype.

<!-- 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: f834c893c7cfde631e458564499d85e8895b4482
2016-09-12 10:19:17 -05:00