gecko-dev/servo/components/layout
Pu Xingyu eab8ab133d servo: Merge #16285 - layout: Use the margin box of an inline block when computing the inline size (from stshine:inline-block-margin); r=emilio
<!-- Please describe your changes on the following line: -->

When computing the inline size of an inline block in inline formating
context, use the margin box of the underling block.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12413 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 4013e9d7a0be666343ef9d806408af5c0a852d91

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a3e0b41862e06b9bc419207ea74be4ba5edcaa11
2017-04-10 15:07:06 -05:00
..
animation.rs servo: Merge #16316 - stylo: Make font base size computation threadsafe (from Manishearth:stylo-threadsafe); r=emilio 2017-04-09 06:15:51 -05:00
block.rs servo: Merge #16073 - Update WR (gl trait, scroll roots) (from glennw:update-wr-glfns); r=mrobinson 2017-03-23 03:43:49 -07:00
Cargo.toml servo: Merge #16301 - Update string-cache (from emilio:atoms-up); r=Wafflespeanut 2017-04-07 06:40:45 -05:00
construct.rs servo: Merge #16096 - Use Servo-specific pseudo elements for anonymous box and text (from stshine:die-modify-style-die); r=emilio 2017-04-01 06:02:08 -05:00
context.rs servo: Merge #16048 - Make image cache per-document rather than global (from ferjm:issue-15701-image-cache); r=jdm 2017-03-27 13:50:46 -07:00
data.rs
display_list_builder.rs servo: Merge #16319 - stylo: Add -moz-element support (from canaltinova:element); r=upsuper 2017-04-10 14:08:04 -05:00
flex.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
floats.rs
flow.rs servo: Merge #15804 - Update WR (reference frames for fixed position elements) (from glennw:update-wr-transforms); r=pcwalton 2017-03-02 17:02:26 -08:00
flow_list.rs servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin 2017-02-18 12:10:26 -08:00
flow_ref.rs
fragment.rs servo: Merge #16285 - layout: Use the margin box of an inline block when computing the inline size (from stshine:inline-block-margin); r=emilio 2017-04-10 15:07:06 -05:00
generated_content.rs servo: Merge #16014 - Per-process lock for CSSOM objects (from servo:style-ref); r=emilio 2017-03-19 14:31:19 -07:00
incremental.rs
inline.rs servo: Merge #15891 - style: Iterate the LRU cache contents from back to front (from emilio:lru-back-to-front); r=bholley,mbrubeck 2017-03-11 02:31:25 -08:00
layout_debug.rs servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin 2017-02-18 12:10:26 -08:00
lib.rs servo: Merge #15768 - Trigger reflow on document.elementsFromPoint (from ferjm:issue-15592-document-elementsFromPoint); r=emilio 2017-03-02 11:43:17 -08:00
linked_list.rs
list_item.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
model.rs
multicol.rs servo: Merge #16006 - Implement -moz-box-ordinal-group property (from upsuper:box-ordinal-group); r=Manishearth 2017-03-17 15:15:01 -07:00
opaque_node.rs
parallel.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
persistent_list.rs
query.rs servo: Merge #15768 - Trigger reflow on document.elementsFromPoint (from ferjm:issue-15592-document-elementsFromPoint); r=emilio 2017-03-02 11:43:17 -08:00
sequential.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
table.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
table_caption.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
table_cell.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
table_colgroup.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
table_row.rs servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin 2017-02-18 12:10:26 -08:00
table_rowgroup.rs servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin 2017-02-18 12:10:26 -08:00
table_wrapper.rs servo: Merge #15417 - layout: Remove cached thread local context from LayoutContext, and use LayoutContext for assign_inline_sizes() (from stshine:column-flexbox); r=emilio 2017-02-07 17:16:05 -08:00
text.rs
traversal.rs servo: Merge #16316 - stylo: Make font base size computation threadsafe (from Manishearth:stylo-threadsafe); r=emilio 2017-04-09 06:15:51 -05:00
webrender_helpers.rs servo: Merge #16284 - Use real clips when generating scroll roots (from mrobinson:scroll-root-clip); r=glennw 2017-04-06 14:32:16 -05:00
wrapper.rs