Commit graph

66 commits

Author SHA1 Message Date
Glenn Watson
5130b51a6c servo: Merge #7807 - Make it possible for iframes to create their own pipeline ID (from glennw:pid); r=jdm
This doesn't change any functionality, but it's the first step towards removing SubpageId.

Adding this change now will allow us to gradually change over code referencing subpage id rather than in one massive PR.

Introduces a namespace for pipeline ID generation - there is a namespace for the constellation thread, and one per script thread.

Source-Repo: https://github.com/servo/servo
Source-Revision: 098bdb5f22500a6e856b085a1140090f63ef8645
2015-10-06 01:08:32 -06:00
Prabhjyot Singh Sodhi
a6dad05d64 servo: Merge #7497 - tests for devtools integration with network requests/responses (from psdh:devtest7473); r=jdm
Fixes #7473

Source-Repo: https://github.com/servo/servo
Source-Revision: 8027777e2409705b1d45cdd4c781e499fd5a7f0d
2015-09-25 11:35:57 -06:00
Ravi Shankar
7d512d50d1 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
f7fb1e4b4a 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
5fc94f81ad 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
Eli Friedman
6924c95bcf servo: Merge #7488 - Simplify reflection usage in Actor code (from eefriedman:reflect-gate); r=jdm
The fixed version is shorter, and doesn't use unstable features.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7e8b8293b051ba787e7717b6bf42655f4ee26f1a
2015-08-31 22:24:08 -06:00
Johann Tuffe
5c3a5a67f5 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
João Oliveira
3436fe7092 servo: Merge #7257 - Replace uses of for foo in bar.iter(), (from jxs:master); r=Ms2ger
and `for foo in bar.iter_mut(), and for foo in bar.into_iter()
(continuation of #7197)

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d6d6a05009606dfbbfc9765d7dc2c745c18f6a5
2015-08-18 02:46:46 -06:00
Ms2ger
a6395ea93a 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
João Oliveira
8410286b02 servo: Merge #7225 - Replace uses of for foo in bar.iter() and for foo in bar.iter_mut() (from jxs:master); r=nox
closes #7197

Source-Repo: https://github.com/servo/servo
Source-Revision: a1b3f477aa541fda4d1b6ccb02c3e56143f4d217
2015-08-15 03:03:21 -06:00
Ms2ger
4028bce156 servo: Merge #7215 - Use external mutability for FramerateActor::ticks (from Ms2ger:ticks); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d4d18f51f2ac46191d94bfe322a2c0164fb98f17
2015-08-14 07:16:19 -06:00
Ms2ger
5b81bb9928 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
Josh Matthews
359f94da09 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
8ca4e6dabe 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
f8de174f17 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
e3a0517b8d 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
Ms2ger
5763c0bede servo: Merge #7123 - Remove unused import (from Ms2ger:warnings); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 53748129321d2c439590368895765f7c93aee8c7
2015-08-10 01:35:11 -06:00
Harrison G
214a812229 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
Harrison G
c7744902f5 servo: Merge #7010 - Fixes #6879 (Improper connections to the devtools server) (from HarryLovesCode:master); r=jdm
Modifies how we behave in the case that something attempts to communicate with the devtools server improperly. This includes...

- Invalid encoding (Non `UTF8`) of the packet length / error parsing / none specified
- JSON encoding error (such as a `Parser::SyntaxError` or a `Parser::IoError`)

Happy to make changes if anyone has an issue with this or feels another way is more idiomatic!

Source-Repo: https://github.com/servo/servo
Source-Revision: 889ef3aef02144ce797266e99e0cdb66ea38871a
2015-08-06 14:00:26 -06:00
Harrison G
b53f75c1eb 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
8325a09ce0 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
Josh Matthews
342b5cb2d3 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
Ms2ger
18fd8097a2 servo: Merge #6459 - Update to rustc 2d0cbf3e3e25e092bd9e4c94d08e446b680869f0 (from servo:rustup_20150625); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 21b48fc44d0b32627918b4778fed16203eecdba5
2015-06-25 12:03:15 -06:00
Manish Goregaokar
3a4ae3831a servo: Merge #6314 - Audit and reduce usage of unstable features (from Manishearth:feature_audit); r=mbrubeck
Will post audit report in a bit

Source-Repo: https://github.com/servo/servo
Source-Revision: 88c1cdc9fca6568d1075ea9577ac996c5f73b98f
2015-06-09 14:31:42 -06:00
Eduard Burtescu
1ef27572ef servo: Merge #6301 - Use the correct log crate and setup env_logger in main (from eddyb:fix-logging-2); r=larsbergstrom
Fixes #6103.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1587d8a301983b881b038c7e443ba6d1deb1f72f
2015-06-06 15:49:56 -05:00
Corey Farwell
2196fc505a servo: Merge #6230 - Remove get_ prefix on getters (from frewsxcv:getters-get); r=nox
Part of #6224

I certainly didn't remove all of them; I avoided `unsafe` areas and also `components/script`

Source-Repo: https://github.com/servo/servo
Source-Revision: f6fe1953343a417b62fb310a380af7c6973849b0
2015-06-02 08:17:03 -05:00
Jacob Parker
1276c4474f 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
a69d841adc 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
Guro Bokum
8059428350 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
f9351542b0 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
95c8716656 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
Dhananjay Nakrani
1633de3077 servo: Merge #5758 - Move actor_workers HashMap outside handle_new_global(). [Issue#5735] (from dhananjay92:Issue#5735); r=jdm
Solves #5735.

Source-Repo: https://github.com/servo/servo
Source-Revision: fe61cdc95da968c21bc15d01cdb16e470f67c492
2015-04-21 08:05:48 -05:00
Adenilson Cavalcanti
4fca85538a servo: Merge #5673 - Squashing a few compiler warnings (from Adenilson:squashWarnings); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 92991f807021fa99b844f03a6458f97fe86bf5c6
2015-04-13 16:47:09 -05:00
Guro Bokum
fe578d1f21 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
00a5a1540c 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
ebfcbc1f1f 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
4b8e394b75 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
7e1ad8fb27 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
Ms2ger
ed37ff9cb6 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
Himaja
3f1f2f164e 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
Simon Sapin
79a6daaf67 servo: Merge #5262 - Fix some post-rustup warnings (from servo:fix-warnings); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 124a78fb2e4d324a7d0ed54da1cca17839d406b7
2015-03-18 15:21:49 -06:00
Ms2ger
66cb126a50 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
057d7cb476 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
ad71ce0ea3 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
da87abc762 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

--HG--
rename : servo/ports/gonk/build.rs => servo/support/rust-task_info/build.rs
2015-02-11 17:24:45 -07:00
Ms2ger
37b5782606 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
e8dbf69dbc 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
Ms2ger
3cee792603 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
Josh Matthews
78741af324 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
0efd1154a6 servo: Merge #4703 - Pass a String to spawn_named (from servo:task); r=saneyuki
IntoString has been removed from Rust, and named() will take a String, so
there is no good reason to do otherwise here.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8df0ee2bb5d40e4b22db1666982e2e5ea36513f6
2015-01-21 03:48:49 -07:00