Commit Graph

29 Commits

Author SHA1 Message Date
Anthony Ramine
c30a83618c servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 7f3a75fa804c0be67f1567ca4a2449cebefa9616
2017-02-18 12:10:26 -08:00
Anthony Ramine
6bb66d30be servo: Merge #12828 - Update serde to 0.8 (fixes #12659) (from nox:serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 9abe9e450b54ef9151bbee1aa0bd2dedb685fa7a
2016-08-12 12:23:10 -05:00
Josh Matthews
0f4323799c servo: Merge #11593 - Make the net monitor panel in FF's devtools show meaningful output (from jdm:netmon); r=nox
<!-- Please describe your changes on the following line: -->
1. Advertise support for the network monitor in the initial protocol communication.
1. Only notify the developer tools server about the final request in an HTTP transaction.
1. Add timing information for connecting to the HTTP server and sending the HTTP request.
1. Reduce duplication between various networkEventUpdate structures by creating a helper function
that merges two JSON structures together. This also corrects the JSON structure so the devtools
client interprets the output correctly.
1. Calculate various header size fields correctly.
1. Remove unnecessary usize->u32 casts by making the appropriate fields usize.
1. Add header values to request and response header messages.
1. Support triggering page reloads via the devtools client.

I apologize that these aren't broken apart. I was making a lot of changes trying to figure out why the panel wasn't working right, and a lot of them were tangled together.

---
<!-- 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 there are no automated tests for the devtools server.

<!-- 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: 1bc94c132e6820293c2178bf95991518b1e8a677
2016-06-05 21:19:22 -05:00
Anthony Ramine
62c6170608 servo: Merge #10285 - Use serde in devtools (from nox:devtools-serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 3c00aff5468e8ac1bc88b9fc01aa6091f9552d95
2016-03-31 18:06:13 +05:00
Anthony Ramine
42502a00d2 servo: Merge #10158 - Allow Firefox to be able to connect to devtools again (from nox:devtools); r=Ms2ger
This doesn't fix the performance tab, but at least lets Firefox initialise the devtools window.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5faab270c6babaaa5ee6b75fecf537e7a648d752
2016-03-24 15:18:23 +05:00
Ravi Shankar
62e8ea2732 servo: Merge #7698 - sorted the declarations in various files (from Wafflespeanut:sorting); r=frewsxcv
This is a direct extract from my abandoned PR for a lint (#7546), along with some rather clumsy modifications (only on `components/script/dom/mod.rs` and `components/style/lib.rs`), because I had to sort some of the files again to make peace with tidy, which hasn't been educated about sorting yet!

Source-Repo: https://github.com/servo/servo
Source-Revision: a7208869f2903e36f9b2f540b55b50283d7df466
2015-09-23 15:02:56 -06:00
Brandon Fairchild
704178a0dd servo: Merge #7662 - Check for multiple import blocks separated by whitespace (from nerith:import); r=frewsxcv
Fixes #7381.

Source-Repo: https://github.com/servo/servo
Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249
2015-09-19 13:34:51 -06:00
Ms2ger
ed5eeef2af servo: Merge #7515 - Lint devtools (from Ms2ger:devtools-lint); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b1b8258a87cf4db69039057124057b0906186d43
2015-09-02 12:32:44 -06:00
Ms2ger
0629abbb2b servo: Merge #7234 - Implement a PerformanceActor (from Ms2ger:PerformanceActor); r=metajack
This is necessary for the devtools "Start Recording Performance" button to
send a message.

(This message is not yet supported, so it leads to
'unexpected message type "startRecording" found for actor "performance4"'.)

Source-Repo: https://github.com/servo/servo
Source-Revision: 0080d0de0e0ae95f2d98d81bef9f02ff995e5dd3
2015-08-15 08:16:55 -06:00
Fabrice Desré
30e10ac321 servo: Merge #7119 - Tentative fix for issue #7110 (from fabricedesre:devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a35360aa31983aad45bdae634c80a24682cb8318
2015-08-13 21:05:34 -06:00
Ms2ger
6ae68829ba servo: Merge #7192 - Implement a ProfilerActor struct (from Ms2ger:profiler); r=jdm
This is sufficient to make the profiler tab show up in Firefox's devtools.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07716780fc805aea63285337ee15e9e56acb47c7
2015-08-13 14:25:38 -06:00
Ms2ger
30431efd3c servo: Merge #6044 - Various cleanup (from Ms2ger:cleanup); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 7bda431e61d06113306c3f12d9f4240a58a7d34d
2015-05-14 07:16:42 -05:00
Guro Bokum
b33284109c servo: Merge #5636 - Firefox timeline integration #4957 (from JIoJIaJIu:timeline); r=jdm
Available markers only:

Reflow
DOMEvent
Also need to implement:

Style marker
Paint marker
Javascript marker
frames reply, depends on getting javascript stack
I decided to make pull request before implemented another markers for getting feedback.
mb it would be better to create separated tasks.

Notices:
Marker doesn't fill stack and stackEnd
MemoryActor sends fake data because there is no memory profiler per tab
FramerateActor sends empty Vec, need implement http://mxr.mozilla.org/mozilla-central/source/dom/base/nsGlobalWindow.cpp#5240

Source-Repo: https://github.com/servo/servo
Source-Revision: 74c847a17fb560dd4cd62069778776f6f06df19f
2015-04-13 12:44:49 -05:00
Josh Matthews
eb750f9db4 servo: Merge #5536 - Remove int/uint from devtools/devtools_traits (from jdm:devtools_uint); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 48ee05620d4a063f6b7c3668e1aec38c68999aae
2015-04-07 08:20:36 -05:00
Ms2ger
5bb28e44e9 servo: Merge #5356 - Move devtools to std::net (fixes #5355) (from servo:devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 06d3fc719c58c8a798f8a8fc827ac47385b61c40
2015-03-25 09:03:51 -06:00
Corey Farwell
24e484fec3 servo: Merge #5311 - Make Actor::handle_message take &str instead of &String (from frewsxcv:handle-message-str); r=jdm
Fixes #5305

Source-Repo: https://github.com/servo/servo
Source-Revision: f62ab247fcb9e5fb7025dfdaa83f4ebd4084eab1
2015-03-23 14:42:50 -06:00
Ms2ger
761d1d93b7 servo: Merge #5303 - Update some code that's feature-gated under core (from Ms2ger:core); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 43f3f6c897916aea75773f74060ec84a338834d0
2015-03-21 12:57:46 -06:00
Ms2ger
03f803ab84 servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f
2015-02-17 07:30:50 -07:00
Ruud van Asseldonk
02a3afe5ec servo: Merge #4925 - Remove glob re-exports in devtools_traits/lib.rs (from ruuda:devtools-traits); r=jdm
This resolves #4921.

Source-Repo: https://github.com/servo/servo
Source-Revision: 40eff84ae1220c3d596cddf4fb789763b71bcb38
2015-02-13 09:06:53 -07:00
Simon Sapin
8fbd363d52 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9
2015-02-11 17:24:45 -07:00
Ms2ger
32b7dee55d servo: Merge #4860 - Fix warnings introduced in #4852 (from Ms2ger:warnings-4852); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 63f6601c133fcee9c598c474695e3c740a02820d
2015-02-06 03:06:44 -07:00
Sagar Muchhal
14fbbae649 servo: Merge #4852 - Add flag to send live updates to devtools (from jdm:buffermessages); r=jdm
Rebased and squashed version of #4191.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0a2bde1b6ea97b68dfa0e62440dc92ef80fb1fd2
2015-02-05 12:36:45 -07:00
Josh Matthews
b11f7d94dc servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Ms2ger
b3c7f9d2ca servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Eduard Burtescu
00fee8ee48 servo: Merge #4220 - devtools: handle script task panics gracefully in ConsoleActor (from eddyb:devtools-panic); r=jdm
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: b8444f96f82791d7bbac456dfe23b71b2b09fea3
2014-12-04 18:04:06 -07:00
Sagar Muchhal
bd27cf8b8b servo: Merge #4213 - Support for Separated Read Write (from jdm:sepreadwrite); r=jdm
Rebased from #4211.

Source-Repo: https://github.com/servo/servo
Source-Revision: 28a132a8f412faa4b15c98939839083836c67052
2014-12-03 22:48:59 -07:00
thiagopnts
a754ab00ea servo: Merge #3955 - Move code related to json packet reading to JsonPacketSender trait (from thiagopnts:devtools-refactoring); r=jdm
I was messing around devtools code and saw some TODOs, is anyone working on it? I took one of them:

```// TODO: this really belongs in the protocol module.```

I would be glad to help with this if no one is on it already, just let me know.

Source-Repo: https://github.com/servo/servo
Source-Revision: 88ff8c61f075e6f8b6123b810f1be4acf444b3d1
2014-11-12 14:42:35 -07:00
Simon Sapin
b3423c8393 servo: Merge #3487 - Upgrade Rust and enable style crate rustdoc (from servo:rustup-20140923); r=Ms2ger
The biggest language change is that enum variants now also reserve (for future use) a name in the type namespace, which must not collide with other types. Some things were renamed, and others qualified as `module::name`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7409685589c550ee7a9f94182f511acddab4c6fd
2014-09-29 10:45:27 -06:00
Josh Matthews
468a8a5fa0 servo: Merge #3172 - Dump initial prototype of devtools server into the build. Expect lies if (from jdm:devtools)
Source-Repo: https://github.com/servo/servo
Source-Revision: b82c0dced08ccda8c3c7f35643c3891bc45b058c
2014-09-19 09:15:03 -04:00