Commit Graph

115 Commits

Author SHA1 Message Date
Glenn Watson
78a36a7eb2 servo: Merge #3500 - Fix some mutable variable warnings (from glennw:warning-fix)
Reviewed-by: pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: f7e5d295188a885027ff8cd5a6d7421581050ccf
2014-09-26 23:09:31 -06:00
Glenn Watson
9e168f34e8 servo: Merge #3486 - Improve acid2. Fix line height calculation. Text fragments get correct enclosing element style (from glennw:inline-fixes)
Reviewed-by: pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 94b7c486b12a50298f0706fce42b70a6ca90cdcb
2014-09-26 21:57:35 -06:00
Glenn Watson
30b905aaf6 servo: Merge #3460 - Fix inline context padding on inline-block (from glennw:inline-block-padding)
Source-Repo: https://github.com/servo/servo
Source-Revision: 4546d5d23caa3f459b75e9a0bf9e91a3376dc197
2014-09-23 07:47:29 -07:00
Glenn Watson
1ab79660a7 servo: Merge #3449 - Add support for min-width and max-width to images (from glennw:img-min-max)
Source-Repo: https://github.com/servo/servo
Source-Revision: 2c3d3b007554990359a06b90ca5380bf466eb308
2014-09-22 14:53:19 +10: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
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
Patrick Walton
04c97f274a servo: Merge #3399 - Handle generated content with display: block correctly during flow (from pcwalton:fix-generated-content-iteration)
Source-Repo: https://github.com/servo/servo
Source-Revision: b8f34bbc5170f78e4939b1d647f8d8498e3c2fb6
2014-09-19 12:27:32 -07:00
Glenn Watson
153b536d4d servo: Merge #3404 - Include margin in inline block intrinsic width. Fixes [edit] links on wikipedia. Also improves google homepage (from glennw:inline-block-fix)
Source-Repo: https://github.com/servo/servo
Source-Revision: 22bca83509e81aabb8e1cd538cc91a642bd39bfa
2014-09-18 07:51:11 -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
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
Matt Brubeck
53e13d52f1 servo: Merge #3296 - Support CSS2 background-position keyword and percent values. r=SimonSapin (from mbrubeck:background-position)
Source-Repo: https://github.com/servo/servo
Source-Revision: 8e2ac7a5c54326f47cbb23394142beee0c17cff2
2014-09-16 10:35:00 -07: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
Glenn Watson
32b09f9347 servo: Merge #3286 - Implement basic support for display: inline-block (from glennw:inline_block)
Source-Repo: https://github.com/servo/servo
Source-Revision: b64f27b2b69996508eed0a76acc7414a791b1a9e
2014-09-12 21:11:27 -07:00
Glenn Watson
d1b4c97b2d servo: Merge #3283 - Partial fix for background images on wikipedia pages (from glennw:bg-image)
Source-Repo: https://github.com/servo/servo
Source-Revision: a18633b163ab81a726efee75309814868c15260f
2014-09-12 11:31:24 +10: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