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
Corey Farwell
3d43073796
servo: Merge #6174 - Reduce max line length from 150 to 120 characters (from frewsxcv:cleanup-long-lines); r=SimonSapin
...
Part of https://github.com/servo/servo/issues/6041
Source-Repo: https://github.com/servo/servo
Source-Revision: 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe
2015-05-24 18:27:26 -05: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
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
Dhananjay Nakrani
34641dc489
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
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
Ms2ger
d04790b91a
servo: Merge #5682 - Mention #5681 in a TODO comment (from Ms2ger:mention-5681); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: e2b43bd3a9136cb90b8e64097e6098db01fca47f
2015-04-14 06:09:13 -05:00
Adenilson Cavalcanti
ca82d9f697
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
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
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
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
Simon Sapin
5cb6c4ea43
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
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
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
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
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
a223980716
servo: Merge #4848 - Fix devtools implementation of downcastable actors. Fixes #4844 (from jdm:devtoolsoops); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: a938bdf9711e5e54d78b74c9446980f76b576958
2015-02-05 08:27:50 -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
Manish Goregaokar
f43b3f0b84
servo: Merge #4739 - Fix some warnings (from Manishearth:warning-patrol); r=Ms2ger
...
Source-Repo: https://github.com/servo/servo
Source-Revision: d373f8dc26239310dec8d2fd66ed72385548cf6f
2015-01-28 02:27:50 -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
0b22e8f634
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
Ms2ger
f59ae9c05a
servo: Merge #4662 - Disallow lines that span more than 160 columns (from Ms2ger:overlong); r=larsbergstrom
...
The Rust style guide suggests 100, but we have too many violations in the
tree already. This check can be tightened over time.
Source-Repo: https://github.com/servo/servo
Source-Revision: ee94b3e8bf659c847bda967700272f8f98fdb0cc
2015-01-19 08:33:48 -07:00
Ms2ger
2eb7c06549
servo: Merge #4612 - Fix the documentation comment for the devtools library (from Ms2ger:devtools-doc); r=saneyuki
...
Also removed a duplicated feature gate.
Source-Repo: https://github.com/servo/servo
Source-Revision: 3897547bc2ef85b8c1797ae6c915121c36873cac
2015-01-11 09:15:45 -07:00
Matthew Rasmus
8a04144529
servo: Merge #4575 - Post-rustup warning fixes (from mttr:warnings); r=jdm
...
Notes:
* This adds `#![allow(missing_copy_implementations)]` to components/*/lib.rs. I'm not sure how to approach the missing Copy warnings (are there things for which Copy should NOT be implemented, and how can I tell?) so I stuck this in to make life easier when looking through the warnings. I can easily remove this if necessary.
* This leaves the following type of warnings, which I couldn't figure out how to approach (I'll investigate it later if no one else wants to).
```
css/matching.rs:72:23: 72:35 warning: use of deprecated item: Use overloaded core::cmp::PartialEq, #[warn(deprecated)] on by default
css/matching.rs:72 this_as_query.equiv(other)
^~~~~~~~~~~~
css/matching.rs:95:10: 95:49 warning: use of deprecated item: Use overloaded core::cmp::PartialEq, #[warn(deprecated)] on by default
css/matching.rs:95 impl<'a> Equiv<ApplicableDeclarationsCacheEntry> for ApplicableDeclarationsCacheQuery<'a> {
```
Source-Repo: https://github.com/servo/servo
Source-Revision: 0793137631cbe4ebbff8fb85639206ce8e41bbb7
2015-01-08 16:03:55 -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
Ms2ger
2979891740
servo: Merge #4542 - Prepare for the rust upgrade (from servo:pre-rustup_20141221); r=saneyuki
...
In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.
Source-Repo: https://github.com/servo/servo
Source-Revision: ba8cf6b0e6145265f9472d4855f078d8b5943fe7
2015-01-04 12:39:47 -07:00
Ms2ger
03365eb590
servo: Merge #4535 - Stop using some obsolete features (from servo:pre-rustup_20141221); r=jdm
...
This prepares for the rust upgrade currently being conducted.
Source-Repo: https://github.com/servo/servo
Source-Revision: e8fac3681b690adb0796b2a807ac95bd9c13597a
2015-01-03 14:39:46 -07:00
Ms2ger
9695007fe1
servo: Merge #4538 - Remove obsolete attributes (from Ms2ger:attributes); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: d8b6cec722e67f1fd39f154f4f0a298f2227501f
2015-01-03 10:39:48 -07:00
Glenn Watson
636d338cf6
servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Greg Weng
5244de1f1a
servo: Merge #4355 - Return real page titles and URLs for devtools tab choices (from servo:devtools-title); r=metajack
...
Fixes #4167 .
Source-Repo: https://github.com/servo/servo
Source-Revision: 6362d060e16aa006877b2920c5de2fad7db3dace
2014-12-12 17:03:45 -07:00
Ben Hsu
22f513ee01
servo: Merge #4233 - Fixes #4232 (from driftersprt:BUG-4232); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: f11089cda0564a826ed53949a4b39d519944e28a
2014-12-08 12:58:09 -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
Shanil Puri
62df127725
servo: Merge #4214 - Implemeneted ModifyAttribute handler to update DOM elements (from jdm:modifyattr); r=jdm
...
Rebased from #4197 .
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b5cc3f4aaf62478b097cba5b2676e7ca99b02a3
2014-12-03 20:28:00 -07:00
Josh Matthews
f855000681
servo: Merge #4147 - Fix the panic on runnig with --devtools due to a change in how type_id g (from jdm:devtoolspanic); r=Manishearth
...
...ets resolved since the last rustc upgrade.
Source-Repo: https://github.com/servo/servo
Source-Revision: 9c3b2ae8a58f5e3fa91a6dc164c136291765a86f
2014-11-29 00:00:48 -07:00
Shanil Puri
126f5888b7
servo: Merge #3796 - Servo exit devtools: Send exit message to devtools on browser exit (from shanil-puri:ServoExitDevtools); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: d1eaa3adda5e59cc34822d6d1477b987796dfd62
2014-11-17 06:15:30 -07:00
Glenn Watson
71f726977a
servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00