Commit Graph

221 Commits

Author SHA1 Message Date
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
Glenn Watson
88915c2e96 servo: Merge #3517 - Revert "Set default resolution to 1280x1024 now that reftests render to (from glennw:revert-res-change); r=metajack
...FBO."

This reverts commit c74798bb6bcb98d2d6af998e2ab0f08e79097147.

Source-Repo: https://github.com/servo/servo
Source-Revision: 132ade0fce514ffeb56f34669967913d9015f035
2014-09-28 19:42:27 -06:00
Glenn Watson
fcd89d3c95 servo: Merge #3513 - Set default resolution to 1280x1024 now that reftests render to FBO (from glennw:default-res)
Reviewed-by: metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 276ca5f2e976fa6c9ce56d98ec2b70efd9c54cdd
2014-09-28 17:42:31 -06:00
Glenn Watson
229fb43c01 servo: Merge #3398 - Allow resolution to be configured on command line. Default to 1280x1024 (from glennw:config-res)
Reviewed-by: SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 177127e5974e30b35632b206f995659e8b663803
2014-09-25 18:27:38 -06:00
Ms2ger
1be3c71f2f servo: Merge #3465 - Handle null strings in Namespace::new (from Ms2ger:ns)
Source-Repo: https://github.com/servo/servo
Source-Revision: c7a575e79338c84652cc0d0cb2f85b1c438819b2
2014-09-24 10:30:13 -04:00
Patrick Walton
8e7fe02560 servo: Merge #3457 - layout: Adjust the position of block formatting contexts based on float placement (from pcwalton:block-formatting-contexts)
Source-Repo: https://github.com/servo/servo
Source-Revision: 6177a3bdcca974d5070b0ecab0973d42963946ec
2014-09-22 20:06:18 -07: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
4d2b8f0444 servo: Merge #3427 - added valid license to tid.rs (from cgaebel:add-license-to-tid)
Source-Repo: https://github.com/servo/servo
Source-Revision: 877de7f694dddd02fcc855a571f99e7c46f7501d
2014-09-19 17:19:42 -07:00
Simon Sapin
a9567001ca servo: Merge #3424 - Add font-size absolute size keywords. Fix #3417 (from SimonSapin:font-size-absolute)
Source-Repo: https://github.com/servo/servo
Source-Revision: 08e004d10650f36af60818fd3c57ca461a97a678
2014-09-19 15:17:55 -07: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
Clark Gaebel
9e4f97cf2d servo: Merge #3397 - Fixes #3386 (from cgaebel:issue-3386)
Source-Repo: https://github.com/servo/servo
Source-Revision: 667f887f49902c4750b80b8be15ba1d4dc3dccdf
2014-09-18 09:29:21 -07:00
Clark Gaebel
603e2d1c80 servo: Merge #3379 - Added more complex profiling metadata (from cgaebel:bucketed-timing)
Source-Repo: https://github.com/servo/servo
Source-Revision: 1b251db7323dce3b7838709c7d2dfb685d8b24a9
2014-09-18 09:12:34 -07:00
Josh Matthews
a3fc1dd4dc servo: Revert "script: Use atom comparison in more places, especially for attributes." for persistent test failures.
This reverts commit 874db261046d6155b1942efa106d2e0014295d6d.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9607b468bc50496c0de3706d22efaa6fdc68b089
2014-09-18 09:20:19 -04:00
Matt Brubeck
5c59759b72 servo: Merge #3395 - Fix unit test failures. r=jdm (from mbrubeck:doctest)
Source-Repo: https://github.com/servo/servo
Source-Revision: 8aeb90e8c34a6872cf418643fef40e67382737e2
2014-09-17 17:05:29 -07:00
Patrick Walton
3834566a2b servo: Merge #3316 - script: Use atom comparison in more places, especially for attributes (from pcwalton:use-atoms)
Source-Repo: https://github.com/servo/servo
Source-Revision: 787a68336524fb9585922b9ed319a8b194fb8ee1
2014-09-17 13:19:00 -07:00
Patrick Walton
ef61465555 servo: Merge #3376 - build: Update string-cache to fix a nasty race (from pcwalton:string-cache-race)
Source-Repo: https://github.com/servo/servo
Source-Revision: aa841ae5080d11e82e50c98a37f961a9c49fbed2
2014-09-17 08:24:32 -07:00
Josh Matthews
48645a8085 servo: Merge #3367 - Add breakpoint utility function (from jdm:breakpoint)
Source-Repo: https://github.com/servo/servo
Source-Revision: 4a1d51b98207078fc4b65a6a55f10a34d56c6019
2014-09-17 02:33:27 -04: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
788c9e2676 servo: Merge #3327 - Reinstate errors for unused variables and imports (from metajack:cargo-profiles)
Source-Repo: https://github.com/servo/servo
Source-Revision: 6c179127a311d2c1dcd4441098a176faafe51f52
2014-09-14 09:56:58 -04:00
Patrick Walton
3ba7e1cc2b servo: Merge #3317 - build: Update submodules (from pcwalton:update-submodules)
Source-Repo: https://github.com/servo/servo
Source-Revision: 5a90f18b7ee9a73511920acfb1e8b04c8c36372e
2014-09-13 02:22:54 -07: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