Ms2ger
82172c291b
servo: Merge #6570 - Require that WorkQueue's QueueData is Sync rather than Send (from Ms2ger:workqueue-sync); r=pcwalton
...
Source-Repo: https://github.com/servo/servo
Source-Revision: c76720d67c0d04f6d77c138c295b4fd4ebf24ee3
2015-07-07 13:07:31 -06:00
Michael Tremel
0eaa4f7d1c
servo: Merge #6567 - Remove unused import (from mt2d2:remove_unused_imports); r=glennw
...
Remove an unused import. This prevents a compiler warning in ```util```.
Source-Repo: https://github.com/servo/servo
Source-Revision: a0db2cf1bb720130aabd0d755e9432bd17063740
2015-07-06 16:37:05 -06:00
Ms2ger
ea2d1bcebf
servo: Merge #6547 - Borrow the QueueData for WorkQueue::run (from Ms2ger:workqueue-reference); r=pcwalton
...
This allows us to get rid of the raw pointers and unsafe dereferencing in
the parallel layout implementation.
Source-Repo: https://github.com/servo/servo
Source-Revision: a3821bf24094bf5bb2a9553e66b69da3b6430aa5
2015-07-06 08:29:17 -06:00
Ms2ger
821cbd07ec
servo: Merge #6513 - Remove the data field from WorkQueue (from Ms2ger:workqueue-data); r=pcwalton
...
Source-Repo: https://github.com/servo/servo
Source-Revision: d09881b051e01f145bf701d48d6d91167bccbe30
2015-07-03 07:22:44 -06:00
Ms2ger
aff6e9a7bd
servo: Merge #6504 - Move back to using a labeled break in WorkQueue (from Ms2ger:workqueue-labeled-break); r=pcwalton
...
This was changed in 18a2050a64cd6f320cc59cb490a69b0e895f11d3; it appears to
work fine now.
Source-Repo: https://github.com/servo/servo
Source-Revision: 59d3b45b74a22fa807872b78e881991e86f7c6ee
2015-07-03 06:39:53 -06:00
Nicholas Nethercote
55d3637142
servo: Merge #6334 - Measure LocalLayoutContexts in LayoutTask and LayoutWorkers (from nnethercote:report-local-contexts); r=pcwalton
...
Passing a function that measures TLS to WorkQueue is a bit weird, but I can't see how else to measure that data.
Source-Repo: https://github.com/servo/servo
Source-Revision: f03f584895f80deb08c77c817f6655609c4ee97c
2015-06-12 18:42:32 -06:00
Patrick Walton
17af08ec45
servo: Merge #6345 - util: Reduce memory barriers and integer divisions in the work queue (from pcwalton:workqueue-arm-optzns); r=glennw
...
Improves scaling on multicore ARM devices.
r? @glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 9ea50957fcf502e48acaa074e08872a73df9ac23
2015-06-12 07:28:19 -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
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
Alexandru Cojocaru
1973b19a3e
servo: Merge #5098 - Remove uint/int inside components/util (partial #4745 ) (from servo:int-util); r=Ms2ger
...
This leaves range.rs alone.
Source-Repo: https://github.com/servo/servo
Source-Revision: 07b918f731c0ff7c101f69195a4ff94b2f13acdc
2015-02-28 07:21:53 -07:00
Patrick Walton
31e5810d70
servo: Merge #4994 - layout: Add an option to visualize parallel layout (from pcwalton:layout-tinting); r=pcwalton
...
r? @metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d26345f868e4261760ce204bdc383941e8f14621
2015-02-20 23:06:48 -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
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
97751da42e
servo: Merge #4708 - Prepare for the rust upgrade (from Ms2ger:rustup-prepare); r=SimonSapin
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 55fbf1f2b6924c50cff6e4ddf359289654f4858a
2015-01-22 08:06: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
Ms2ger
843040ab81
servo: Merge #4548 - Various cleanup (from Ms2ger:cleanup); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 65ee8166bd64e911502e29a050258b70d9f263aa
2015-01-05 01:27: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
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
Clark Gaebel
73be3aed6e
servo: Merge #3827 - Run all task spawning through util, to allow for easy hooking (from cgaebel:use-custom-spawn); r=pcwalton
...
During debugging, I found it useful to hook all task creation in a
central location, and util::task was the perfect place for it.
r? @pcwalton (or maybe someone else, I'm kinda sending you a bunch of
reviews today because I don't know who better to give them to)
Source-Repo: https://github.com/servo/servo
Source-Revision: ff06be91ebe770290ba912ee71a303810aa62cea
2014-10-28 11:24:43 -06:00
Clark Gaebel
24cc26cb03
servo: Merge #3820 - Rebase Laleh's #3505 (from cgaebel:rebase-lalehs-patch); r=pcwalton
...
I addressed all but one of the code review comments, which was a request
for documentation on where a number came from (which I'm not qualified to
answer), and rebased this on to latest master.
xref: #3505 cc: @LalehB @larsbergstrom
r? @pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 9e94ecf99cff7c57275ab39c7b11870e55756d63
2014-10-27 18:06:43 -06:00
Keegan McAllister
8321c9c421
servo: Merge #3797 - Debug-only dynamic checks for layout and GC use of DOMRefCell (from kmcallister:domrefcell); r=jdm
...
r? @mbrubeck, @jdm
Alternative to #3770 and #3716 .
Source-Repo: https://github.com/servo/servo
Source-Revision: 0c12f630e6352fc2aa00b638d014b2505f68af1f
2014-10-24 18:09:27 -06: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
Simon Sapin
e245f210fb
servo: Merge #3438 - Upgrade Rust (from servo:rustup)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c
2014-09-20 15:35:08 -07:00
Clark Gaebel
2ce9a1478b
servo: Merge #3212 - Added a bloom filter to CSS selector matching (from cgaebel:style-resolution-bloom-filter)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: ad02534c10d85cc011908fe6b2ba06cfcdcb226c
2014-09-15 22:27:24 -06:00
Jack Moffitt
132ee35633
servo: Merge #3230 - Cargoify servo (from servo:cargoify)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: b1305bb7d051f83850c51bb0da0ccc86a5e07922
2014-09-09 08:18:18 -06:00