Commit Graph

108 Commits

Author SHA1 Message Date
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
Manish Goregaokar
3e8738a6e4 servo: Merge #7697 - Rust upgrade to rustc 1.5.0-dev (6217b002b 2015-09-21) (from servo:rustup_20150921); r=Ms2ger
Snapshot doesn't exist yet. Rust master+ should work.

Also https://github.com/serde-rs/aster/pull/33 hasn't merged yet.

r? @Ms2ger @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: f7f16870bebdc9359661544054259b37780f1331
2015-09-23 06:45:18 -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
0ba5be0108 servo: Merge #7435 - Send the start and end half of a TimelineMarker to the devtools … (from Ms2ger:markers); r=jdm
…PullTimelineMarkers thread together.

Source-Repo: https://github.com/servo/servo
Source-Revision: b68b31a062c245684c3b41132c568fd3836fb30c
2015-08-28 13:51:32 -06:00
Johann Tuffe
25ce9ab4be servo: Merge #7265 - Add alphabetical order check for use statements (from tafia:tidy-use); r=Ms2ger
close #7112

Source-Repo: https://github.com/servo/servo
Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
2015-08-20 07:43:56 -06:00
Manish Goregaokar
dca1446a71 servo: Merge #7224 - Integrate clippy into Servo; cleanup some of script (from Manishearth:clippy); r=Ms2ger
The integration is off by default for now. You can try it out with `./mach build --features "script/plugins/clippy"`.

We're using a branch of clippy with some of the lints changed to Allow, either because they don't apply to us, or because they're noisy and dwarf other warnings (but still should be fixed)

After going through the rest of Servo's warnings I'll figure out which lints we should be keeping.

There's a cargo bug with optional deps that makes it hard for this to work with Cargo.lock -- so this PR contains no changes to lockfiles (and running the build with clippy on may dirty the lockfile, though it gets fixed later)

Source-Repo: https://github.com/servo/servo
Source-Revision: 50e1c967e4299c1515575f73d407f5f6b977d818
2015-08-18 08:15:51 -06:00
Bogdan Cuza
e4347f5a6a servo: Merge #7097 - Measure heap memory usage for more types. Fixes #6951 (from boghison:memtypes); r=jdm
Also adds HeapSizeOf implementations/derive for some types. I've used "Cannot calculate Heap size" as a reason everywhere, because my imagination is rather limited. If you'd like me to change this message for specific types, please write something like this: "Trusted - Cannot calculate Heap size for Trusted" so that it would be easier for me to replace them through a script :)

Source-Repo: https://github.com/servo/servo
Source-Revision: a03616f379c255cc6c9b6e1d04dd7d98bd9926ce
2015-08-13 13:16:14 -06:00
Josh Matthews
23744c5983 servo: Merge #7132 - Document the use and meaning of the devtools control messages. Fixes … (from jdm:docenum); r=ms2ger
…#6922.

Source-Repo: https://github.com/servo/servo
Source-Revision: f3b7c5cb4b0fab20db51b7560c3b3bb2d115be69
2015-08-13 12:41:48 -06:00
Ms2ger
df9f464076 servo: Merge #7167 - Disallow unsafe code in the devtools and devtools_traits crates (from Ms2ger:unsafe-devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2f0a9e7fce9b8d3ee5ddf0cc5431547462378ff0
2015-08-12 06:48:07 -06:00
wilmoz
a8432c2ad7 servo: Merge #7140 - Remove Message suffix from NetworkEventMessage (from wilcus:master); r=jdm
https://github.com/servo/servo/issues/7129

Source-Repo: https://github.com/servo/servo
Source-Revision: 15a73614f4ae9f7b00a44aa66d899ab4a5254114
2015-08-11 01:34:47 -06:00
Brandon Fairchild
ad94b41657 servo: Merge #7136 - Rename SendConsoleMessage to ConsoleAPI (from nerith:consoleapi); r=jdm
Fixes #7131.

Source-Repo: https://github.com/servo/servo
Source-Revision: 41166fdb5bd16e96827118b9ab5543c65418c200
2015-08-10 15:10:57 -06:00
Harrison G
be26ea3e85 servo: Merge #7101 - Allows object evaluation in devtools -- Closes #6724 (from HarryLovesCode:master); r=jdm
The purpose of this is to fix how objects were previously evaluated in
the developer tools.

- Before this, evaluating an object such as the `window` would `panic!`
- After this, evaluating an object such as the `window` outputs `[object
  Window]`

A few things to note:

- This commit contains `unsafe` code.
- This does not contain a test because the developer tools cannot be properly tested until #5971 lands.

Source-Repo: https://github.com/servo/servo
Source-Revision: f77973c903a3e08067feed3ba39cff3c6bf8ac11
2015-08-09 18:27:53 -06:00
Patrick Walton
78e790ea7d servo: Merge #7099 - servo: Update ipc-channel to pick up bincode support (from pcwalton:bincode); r=jdm
Large improvement in page load times, especially in debug builds.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: d4d4d6dc013ee322282de7ec0effa54c8827a775
2015-08-08 10:55:00 -06:00
Michael Tremel
6fdc5483aa servo: Merge #7091 - Remove unneeded import (from mt2d2:unused_imports_devtools); r=SimonSapin
This fixes #7087.

Source-Repo: https://github.com/servo/servo
Source-Revision: 23b81326cc2ac86ef93ff067ecbfa2bce482084f
2015-08-08 02:18:34 -06:00
Connor Imes
fe8633741d servo: Merge #7009 - Remove typedefs DevtoolsControlChan and DevtoolsControlPort (from connorimes:remove-confusing-typedefs); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: a5c7508fabb36f9f5bc14e84b5f481cf7036e5f7
2015-08-07 14:41:37 -06:00
Harrison G
590b59d477 servo: Merge #6893 - Fixes Issue #6866 (from HarryLovesCode:master); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1809748dc12ec63e3179b66109c91983f744c235
2015-08-02 16:05:14 -06:00
Patrick Walton
e83405fec0 servo: Merge #6745 - devtools: Convert the developer tools to run over IPC (from pcwalton:devtools-ipc); r=jdm
This was a large, invasive change.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 4bc1db3fe85f2a1a04536f0f6045b53b1319f4bc
2015-07-27 11:09:38 -06:00
Bogdan Cuza
a7c587c432 servo: Merge #6648 - Make tidy check for "*" in toml files (from boghison:tidytoml); r=jdm
This checks every .toml file for an asterisk and prints an error if found.

Source-Repo: https://github.com/servo/servo
Source-Revision: 58e9bc6583b6ebbeb27e3b28a6b271ee48cd695a
2015-07-20 14:43:05 -06:00
Patrick Walton
c301520dae servo: Merge #6593 - compositing: Make the constellation messages serializable (from pcwalton:constellation-ipc); r=jdm
Same idea as before. This depends on:

* https://github.com/servo/euclid/pull/94
* https://github.com/hyperium/hyper/pull/603

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 2f4bdc6ad631dc56b64622e3390943b59270b3ae
2015-07-18 07:43:24 -06:00
Martin Robinson
2b8865b89f servo: Merge #6591 - Upgrade to rustc 1.3.0-dev (fddfd089b 2015-07-10) (from servo:rustup_2015-07-10); r=larsbergstrom
Depends on https://github.com/jgraham/webdriver-rust/pull/12.

Fixes #6020.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9af229b83095f2f8cfe7b61003b85ddf781f4ea7
2015-07-14 13:40:22 -06:00
Josh Matthews
060f8b5657 servo: Merge #6540 - Make devtools usable once more (from jdm:devtoolsfix); r=glennw
This fixes the panic by rebasing #6189, and also makes cached messages appear once more.

Source-Repo: https://github.com/servo/servo
Source-Revision: c04b7bbf6e5efe2e5217b69c9680e4e91bbd6ecd
2015-07-07 09:43:36 -06:00
Manish Goregaokar
d9657f9100 servo: Merge #6254 - Move to latest hyper everywhere, more package updates (from servo:rustup_20150601); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 20f63459ef198bf96679cbb72355917e7a774265
2015-06-02 12:53:37 -05:00
Jacob Parker
ce3f93c1b7 servo: Merge #6193 - fixes #5232, more console log levels sent to devtools (from j3parker:fix-5232); r=nox
fixes #5232

The correct styling shows up in the Firefox devtools (e.g. a caution symbol beside warning messages.)

I couldn't quickly find the corresponding Firefox code that handles log-levels so the values I'm sending are "guesses" (but they work seem to work.) I'll look today because I'm sending "log" for Debug-level, Error for failed asserts etc.

Source-Repo: https://github.com/servo/servo
Source-Revision: ec79881471bf3e952f40ee7021b561532a9020c6
2015-06-01 20:13:30 -05:00
Tamir Duberstein
0c2bb56905 servo: Merge #6168 - Implemented GetCachedMessages (from tamird:get-cached-messages); r=jdm
Rebase of #4175, closes #4175. r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 8759d42559bc5c10f8d90903f33f75bddf44d9fe
2015-05-26 10:34:03 -05:00
Tamir Duberstein
cf2fe28080 servo: Merge #6169 - Use a struct variant for clarity (from tamird:struct-variant); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 34a617aaa133b0bc0756dd7d904203c9d633e69a
2015-05-25 15:53:56 -05:00
Simon Sapin
c76487e1bf servo: Merge #6021 - Upgrade to Hyper 0.4.0 (from SimonSapin:hyperup); r=Manishearth
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 8cacf20a075b3747509897599c37662721d18d1c
2015-05-12 12:42:49 -05:00
Guro Bokum
8800f4e7e5 servo: Merge #5753 - Start using on_refresh_driver_tick #5681 (from JIoJIaJIu:timeline); r=jdm
RequestAnimationFrame
[Task](https://github.com/servo/servo/issues/5681)

Source-Repo: https://github.com/servo/servo
Source-Revision: 5e59e77c416dbe35e8c30ca1c21c9088ed17a079
2015-05-06 00:50:13 -05:00
Himaja
b4daf62fd9 servo: Merge #5947 - Extend the developer tools support (from jdm:devtools); r=jdm
Implement HTTP request/response notifications per https://github.com/servo/servo/wiki/More-developer-tools-student-project .

Rebased from #5920.

Source-Repo: https://github.com/servo/servo
Source-Revision: ab589da1f464ed00b0105bc4531690da0118ea5b
2015-05-05 11:52:44 -05:00
Simon Sapin
b72bb5e7d5 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Jinwoo Song
9ceb9ebb6a servo: Merge #5818 - Remove unused ScriptDevtoolControlMsg enum (from Jinwoo-Song:removeUnused); r=mbrubeck
Simple patch to remove unused enum, ScriptDevtoolControlMsg.

r? @jdm
cc @yichoi

Source-Repo: https://github.com/servo/servo
Source-Revision: ef1e50aa770e48018ae32ea5f6f2c0ad2056ad44
2015-04-23 22:50:32 -05:00
Guro Bokum
af5fe6574f servo: Merge #5699 - Send high resolution millisecond timestamps in timeline markers #5665 (from JIoJIaJIu:timeline); r=jdm
[Task](https://github.com/servo/servo/issues/5665)

Source-Repo: https://github.com/servo/servo
Source-Revision: cd16d1c3356d4bbc9277c2c843da8da002f27f3c
2015-04-15 09:46:46 -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
Thiago Pontes
79eadfe612 servo: Merge #5181 - Notify devtools about new worker globals (from thiagopnts:master); r=jdm
This is for #4704. I'm not sure if this is the best approach, so I'm open to suggestions.

Source-Repo: https://github.com/servo/servo
Source-Revision: 439e3150d74453b86abbcc7934b7e5152f102940
2015-03-27 13:33:56 -06: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
Avi Weinstock
f73a95411d servo: Merge #5345 - Create a seperate thread for devtools' TCP acceptor (Closes #5294) (from aweinstock314:master); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1f0291c4db25c7f0f6bb2c0f1126819162a97aa6
2015-03-24 16:39:49 -06:00
Himaja
c49184a5b4 servo: Merge #5229 - M1503: Extend the developer tools support - Initial steps (from hsvalava:m1503); r=jdm
Fixing ConsoleMsg for console.log messages in the Developer Tools web console.

Source-Repo: https://github.com/servo/servo
Source-Revision: ab8d43910ca2f3e60e3dd1417be80ab53f438b6e
2015-03-19 21:48:48 -06:00
Ms2ger
f4ea3a3dd0 servo: Merge #5256 - Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-de (from servo:rustup_20150311); r=jdm
...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2
2015-03-18 11:25:00 -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
Ms2ger
02ab4f60c3 servo: Merge #4922 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 66f4faf44fbc6e8703d4336219a20dd3b19fb493
2015-02-13 05:33:49 -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
f3a69a15a3 servo: Merge #4886 - Import msg as msg rather than servo_msg (from Ms2ger:servo_msg); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 29d3b872de4abb693b75e71fc0b987c52b0fd1f6
2015-02-10 03:51:46 -07:00
Sagar Muchhal
379fa70f19 servo: Merge #4853 - Add console message support to devtools. Does not actually cause logging (from jdm:consoleapicall); r=jdm
... to occur in the remote console.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d560806f8fd621c2744429ae534e93e1f2563cb
2015-02-05 14:45:45 -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
66c8eb4c1e servo: Merge #4519 - Cookie support (from jdm:cookies); r=Ms2ger
As specified in http://tools.ietf.org/html/rfc6265. Requires https://github.com/servo/cookie-rs/pull/1. Tested against http://www.joshmatthews.net/cookie.php, http://www.html-kit.com/tools/cookietester/, https://github.com/login, and https://mobile.twitter.com/session/new .

Source-Repo: https://github.com/servo/servo
Source-Revision: 7e3f504d94ffb77ec6148166d2ab73978e1c71c8
2015-02-04 11:57:54 -07:00
Ms2ger
155838196e servo: Merge #4766 - Import the util crate as util rather than servo_util (from Ms2ger:util); r=Manishearth
This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.

Source-Repo: https://github.com/servo/servo
Source-Revision: 27e0f16407629422b5e047e067d458142372c97e
2015-01-29 05:12:49 -07:00
Ms2ger
3c5b07cc8a servo: Merge #4756 - Fix various build warnings (from Ms2ger:warnings); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 88b781421aa78a2f466e6d170f89d13a870643cd
2015-01-28 13:15:53 -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
2b06b0f070 servo: Merge #4606 - Move the documentation comment for the devtools_traits crate to have it picked up (from Ms2ger:devtools-comment); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1834359f1661fe504e5b8ff3ee2bc0cb8d744d21
2015-01-10 07:39:44 -07:00