Keegan McAllister
8578d570cb
servo: Merge #3530 - Use string-cache's Namespace type, backed by Atom (from kmcallister:namespace-atom); r=Ms2ger
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 698b916c097ae0272a31a680cba7fc6dbd03ca3d
2014-09-30 02:42:23 -06:00
Glenn Watson
fbe6aa4d26
servo: Merge #3523 - Add support for <super> and <sup> tags. Fixes equations on wikipedia (from glennw:wiki-equations); r=pcwalton
...
Source-Repo: https://github.com/servo/servo
Source-Revision: b2ff320aecab80b06aeedad440c28b23b2dc3824
2014-09-29 15:36:26 -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
Cameron Zwarich
4150491f96
servo: Merge #3501 - Remove the 'static lifetime parameters from TElement methods (from zwarich:telement-lifetimes)
...
Reviewed-by: jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c9c8d63727560ab88a8b739f5ac305b8a02410d2
2014-09-27 17:09:28 -06:00
Patrick Walton
f2eb3141b3
servo: Merge #3498 - Stop double-counting stuff in inline-block (from pcwalton:border-box-double-counting)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: b7345796bc696bd0e7bc00384a71a30c676a3456
2014-09-27 13:12:30 -06:00
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
Patrick Walton
af820be1f4
servo: Merge #3492 - layout: Support any display property in generated content, and allow (from pcwalton:clear-generated-content-table)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 33e2a7b3625c82e83c7767e81266c2a23f509bed
2014-09-26 22:24:32 -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
Patrick Walton
ef2254d096
servo: Merge #3483 - layout: Block formatting contexts should contain all their floats (from pcwalton:block-formatting-contexts-containing-floats)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: ab17d31bbf8c6884f858381f3d5b7e62c4de87c6
2014-09-26 01:42:27 -06:00
Patrick Walton
8dfaa4b286
servo: Merge #3467 - layout: Enhance the heuristic that guesses the inline size of block formatting contexts (from pcwalton:enhance-block-formatting-context-guess)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 20f5fdd000408867ac2d3a90ad9a8b55cfb8bc9e
2014-09-25 19:24:30 -06:00
Patrick Walton
c6e166d8b3
servo: Merge #3472 - layout: Unify the block-size computation for blocks and floats (from pcwalton:unify-block-and-float-layout)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 9fb47b7636ca79c64acbf73a2c55cc6bf5cd4917
2014-09-25 17:48:35 -06:00
Cameron Zwarich
0c0ca18e96
servo: Merge #3478 - Remove use of deprecated get_mut_ref (from zwarich:get-mut-ref)
...
Reviewed-by: metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d9c13352c1ecfefc3a5f07871421c5d24f02c7e7
2014-09-25 17:24:33 -06:00
Cameron Zwarich
93fe906d1b
servo: Merge #3480 - Fix trailing whitespace tidy errors (from zwarich:trailing-whitespace)
...
Reviewed-by: larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: c2d6d8084c7afc2b865a09cb4847fb1a815ef607
2014-09-25 17:00:34 -06:00
Patrick Walton
0c6129e4c9
servo: Merge #3434 - layout: Float table wrappers directly instead of generating a block (from pcwalton:directly-floated-tables)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 1fba32af9ff68db73768b4732d003ea7aad09b28
2014-09-25 10:36:33 -06:00
Patrick Walton
e6b2857d7a
servo: Merge #3475 - layout: Consider relatively positioned blocks as possible block (from pcwalton:block-formatting-context-fixes)
...
Reviewed-by: glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: e9a7b44f688dacd46ce4971a2a79e42d6a80a8fe
2014-09-25 00:26:42 -06:00
Patrick Walton
8c9531a007
servo: Merge #3458 - layout: Implement white-space: nowrap (from pcwalton:whitespace-nowrap)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: d9f836bc75c0d6e4e813d9f74819bd8578742598
2014-09-23 20:22:33 -07:00
Glenn Watson
0c66868669
servo: Merge #3459 - Add support for small-caps font-variant (from glennw:small-caps)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 98222cf24cd64c246fc25b9009f3c198bf33dcbf
2014-09-24 09:49:05 +10: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
Manish Goregaokar
431ec41351
servo: Merge #3435 - Reorganize macros crate; r=jdm (from Manishearth:macro_reorg)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 27f3bcd7183d836bd454e687706b4e76d6d3b312
2014-09-23 17:53:37 +05: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
Patrick Walton
a7ddc126e6
servo: Merge #3454 - layout: Translate floats when clearing non-floated blocks (from pcwalton:float-clear-bug)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: a6ff0479d9b8ea6a35570765748a6fc86d0dcb47
2014-09-22 17:36:36 -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
Tetsuharu OHZEKI
582d2f0c2b
servo: Merge #3418 - Replace manual Encodable implementation for LayoutDataRef with Untraceable (from saneyuki:untrace)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: de67710934ac89de0cf21911dc57dcda7cb0fae1
2014-09-20 16:40:06 +09:00
Patrick Walton
8d26ada345
servo: Merge #3430 - layout: Make percentage heights propagate through inline flows (from pcwalton:inline-block-percentage-height)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: c51b8a07acbbfa8539b9234c7717a9af53a9e2b8
2014-09-19 23:05:55 -07:00
Glenn Watson
65afbcd2f4
servo: Merge #3420 - Adds support for table layout trace and updates viewer for tables (from glennw:table-debug)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: ccda8f204acb014387e92f1ecd47355e9e45ed89
2014-09-19 19:50:47 -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
Patrick Walton
3367860bc2
servo: Merge #3401 - layout: Remove layout/extra.rs (from pcwalton:refactor-layout)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: f139eb51763091165136c88a7b9931fc09ebe2cc
2014-09-19 10:51:02 -04:00
Glenn Watson
4426bc91ca
servo: Merge #3419 - Fix img with display: block. Fixes text/image overflow on wikipedia (from glennw:img-block)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 2652d223f50d53ee5a8a07ff4a3d6a25b510d1f1
2014-09-19 19:20:27 +10:00
Glenn Watson
63d6608859
servo: Merge #3421 - Fix padding on tables. This fixes the TOC on wikipedia pages (from glennw:table-padding)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: a3b20d81799f13f602b8895e423c41c9cabfda5c
2014-09-19 17:50:50 +10:00
Matt Brubeck
118121ccbe
servo: Merge #3414 - Fix line splitting in white-space: pre flows. r=gw (from mbrubeck:pre-line-break)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: b11a110e85ca5670a1d492b6deb616fe8a90cf5b
2014-09-18 19:30:37 -07:00
Patrick Walton
30838e65ac
servo: Try to unbreak the build by removing unused import
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 5e5f77a354500103247359e63f1f4147919ade62
2014-09-18 10:56:58 -07: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
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
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
Manish Goregaokar
1a1910fec1
servo: Merge #3374 - Add lint for ensuring proper rooting of JS<T>; r=jdm (from Manishearth:lint_unrooted_jsmanaged)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 11ba79894a13ddaee4bfcdd64d23fd4b54a041f3
2014-09-17 17:47:19 +05: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
Matt Brubeck
6697eaf6ae
servo: Merge #3339 - Implement percentage heights for block flows. r=SimonSapin (from mbrubeck:percent-height)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 66a7de750c303b482572db2d71cf1f90a1c01828
2014-09-16 09:03:04 -07:00
Matt Brubeck
6bf4cede00
servo: Merge #3352 - Move link rel=stylesheet fetching to layout task. r=jdm (from mbrubeck:link-style)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 0e2cdc5cca80e636bd904ea99e86f31a4ea9bcd2
2014-09-16 08:16:29 -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
Glenn Watson
40036f348a
servo: Merge #3341 - Implement generated_containing_block_rect for TableFlow. Fixes #3337 (from glennw:table-cb)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 13ae369dec3f02b5f992f1c6c276cde646ef39e9
2014-09-15 09:29:39 -07:00
Josh Matthews
945cf37cf4
servo: Merge #3331 - Propagate absolute descendants of inline block flows. Fixes #3326 (from jdm:ib-abs)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 2f12d5628f6a2a6b101c156baf66777b7ca5a4bb
2014-09-15 10:45:24 +10: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
8b1024dcf7
servo: Merge #3305 - Add support for tables that are floated (from glennw:float-table)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: fb54c1eb08839f43a15df30cf241c21b03c4beeb
2014-09-13 18:55:56 +10: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
Patrick Walton
863992f590
servo: Merge #3293 - layout: Don't crash on floated generated content (from pcwalton:floated-generated-content-crash)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 20cde10e124df5c9aa9bd475bfb2b05493c114f6
2014-09-12 14:10:44 -07:00