mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
gecko-dev/servo/components
История
Ramshell 109e0117e6 servo: Merge #20573 - Add support for percentages in column-gap (from Ramshell:issue/20498); r=mbrubeck 
<!-- Please describe your changes on the following line: -->
# Changes in this PR
* I've removed the `if product == "gecko"` line in order to make the column_gap type "NonNegativeLengthOrPercentageOrNormal" always.

* Then I've changed this line
```rust
Either::First(len) => len.into(),
```
to
```rust
Either::First(len) => len.0.to_pixel_length(content_inline_size).into(),
```

---
<!-- 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 build-geckolib` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20498  (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because there are tests already for this in wpt, in particular css/css-align/gaps/column-gap-parsing-001.html for the parsing bits, and css/css-multicol/multicol-gap-percentage-001.html for the layout bits.

<!-- 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: ecf71d77cde1ce998b2d2b7fd7a6d45dfe40343e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 16a3fc0d6220196432027a859c13b1f364217769
 		2018-04-06 19:48:59 -04:00
..
allocator servo: Merge #19061 - FreeType: don’t use usable_size() as deallocation size (from servo:ft-alloc); r=mbrubeck 2017-10-30 12:40:34 -05:00
atoms servo: Merge #20181 - Fire the pageshow event at the end of the page load (from fabricedesre:end-load-pageshow); r=jdm 2018-03-06 10:49:51 -05:00
bluetooth servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
bluetooth_traits servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
canvas servo: Merge #20539 - Moar WebGL improvements, again (from servo:webgl); r=emilio 2018-04-05 03:31:41 -04:00
canvas_traits servo: Merge #20539 - Moar WebGL improvements, again (from servo:webgl); r=emilio 2018-04-05 03:31:41 -04:00
compositing servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
config servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
constellation servo: Merge #20507 - New Session History (from cbrewster:history_transactions); r=asajeffrey 2018-04-05 19:26:37 -04:00
debugger servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
deny_public_fields servo: Merge #20022 - Update syn, quote and synstructure (from Eijebong:syn); r=nox 2018-02-13 11:15:54 -05:00
devtools servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
devtools_traits servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
dom_struct servo: Merge #19476 - Use workspace.default-members to specify default crates for cargo build (from servo:default-members); r=nox 2017-12-07 06:53:07 -06:00
domobject_derive servo: Merge #20246 - Use higher level handles from JS bindings (from marmistrz:test-lifetime-handles); r=jdm 2018-03-28 16:22:01 -04:00
fallible servo: Merge #19494 - Update smallvec to 0.6 (from Eijebong:smallvec); r=emilio 2017-12-05 13:44:19 -06:00
geometry servo: Merge #20071 - Use typed coordinates more (from paulrouget:typedsize); r=glennw 2018-03-16 17:18:24 -04:00
gfx servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
gfx_traits servo: Merge #19933 - Update WebRender (from mrobinson:update-wr); r=emilio 2018-02-06 09:12:58 -05:00
hashglobe servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
jstraceable_derive servo: Merge #20022 - Update syn, quote and synstructure (from Eijebong:syn); r=nox 2018-02-13 11:15:54 -05:00
layout servo: Merge #20573 - Add support for percentages in column-gap (from Ramshell:issue/20498); r=mbrubeck 2018-04-06 19:48:59 -04:00
layout_thread servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
layout_traits servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
malloc_size_of servo: Merge #20504 - Hide non-Servo heap measurement (from jdm:unbreak); r=bustage 2018-04-02 10:40:02 -04:00
malloc_size_of_derive servo: Merge #20022 - Update syn, quote and synstructure (from Eijebong:syn); r=nox 2018-02-13 11:15:54 -05:00
metrics servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
msg servo: Merge #19975 - Kill browserhtml (from paulrouget:killbhtml); r=mbrubeck,emilio 2018-02-13 04:54:47 -05:00
net servo: Merge #20391 - Measure cache memory usage (from modal17:iss19251); r=jdm 2018-04-02 02:01:50 -04:00
net_traits servo: Merge #20391 - Measure cache memory usage (from modal17:iss19251); r=jdm 2018-04-02 02:01:50 -04:00
nonzero servo: Merge #18875 - Remove the need for rust-mozjs to use unstable Rust features (from servo:stable-js); r=nox,jdm 2017-10-16 17:07:50 -05:00
profile servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
profile_traits servo: Merge #20391 - Measure cache memory usage (from modal17:iss19251); r=jdm 2018-04-02 02:01:50 -04:00
rand servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
range servo: Merge #18938 - Replace all uses of the `heapsize` crate with `malloc_size_of` (from nnethercote:bug-1409255); r=SimonSapin 2017-10-18 13:56:05 -05:00
remutex servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
script servo: Merge #20565 - Daily batch of drive-by WebGL improvements, wholesome and gluten-free (from servo:webgl); r=emilio 2018-04-06 05:52:06 -04:00
script_layout_interface servo: Merge #20447 - NCSU Canvas Rendering Project Initial Steps (from Brody-Eastwood:master); r=jdm 2018-04-02 22:24:34 -04:00
script_plugins servo: Merge #19098 - Make the unrooted_must_root conditional on a default Cargo feature (from servo:minimal-plugin); r=jdm 2017-11-02 09:28:13 -05:00
script_traits servo: Merge #20447 - NCSU Canvas Rendering Project Initial Steps (from Brody-Eastwood:master); r=jdm 2018-04-02 22:24:34 -04:00
selectors servo: Merge #20454 - Update to rustc 1.25.0-nightly (bacb5c58d 2018-01-26) (from emilio:rustup); r=SimonSapin 2018-03-29 09:12:45 -04:00
servo servo: Merge #20517 - Fix the env_logger update (from Eijebong:fix_log); r=mbrubeck 2018-04-03 09:14:41 -04:00
servo_arc servo: Merge #20088 - Fix license metadata for servo_arc crate (from mbrubeck:license); r=SimonSapin 2018-02-21 19:35:55 -05:00
size_of_test servo: Merge #16870 - Add size_of tests for geckolib selectors (from servo:size_of); r=emilio 2017-05-16 04:00:30 -05:00
style servo: Merge #20573 - Add support for percentages in column-gap (from Ramshell:issue/20498); r=mbrubeck 2018-04-06 19:48:59 -04:00
style_derive servo: Merge #20275 - Finish cleaning up trait bounds generation in style_derive (from servo:derive-all-the-things); r=emilio 2018-03-12 04:52:02 -04:00
style_traits servo: Merge #20454 - Update to rustc 1.25.0-nightly (bacb5c58d 2018-01-26) (from emilio:rustup); r=SimonSapin 2018-03-29 09:12:45 -04:00
url servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00
webdriver_server servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
webvr servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin 2018-03-28 15:08:52 -04:00
webvr_traits servo: Merge #20371 - Bump ipc-channel and bincode (from Eijebong:ipc-channel); r=nox 2018-03-21 09:00:16 -04:00