Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upLayout 2020: run layout and paint background-color #24528
Merged
Conversation
highfive
commented
Oct 23, 2019
|
Heads up! This PR modifies the following files:
|
highfive
commented
Oct 23, 2019
|
Very nice. @bors-servo r+ |
|
With rustfmt :] @bors-servo r=nox |
|
|
bors-servo
added a commit
that referenced
this pull request
Oct 24, 2019
Layout 2020: run layout and paint background-color
|
|
|
Failed at diff --git a/Cargo.lock b/Cargo.lock
index da1e5f8..6badf89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,6 +149,12 @@ dependencies = [
]
[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+
+[[package]]
name = "azure"
version = "0.37.0"
source = "git+https://github.com/servo/rust-azure#1dbd223157997b5b5301e7da73bff37f928a7418"
@@ -438,7 +444,7 @@ dependencies = [
"azure",
"byteorder",
"canvas_traits",
- "cssparser",
+ "cssparser 0.27.1",
"embedder_traits",
"euclid",
"fnv",
@@ -462,7 +468,7 @@ dependencies = [
name = "canvas_traits"
version = "0.0.1"
dependencies = [
- "cssparser",
+ "cssparser 0.27.1",
"euclid",
"ipc-channel",
"lazy_static",
@@ -877,15 +883,34 @@ dependencies = [
[[package]]
name = "cssparser"
+version = "0.25.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbe18ca4efb9ba3716c6da66cc3d7e673bf59fa576353011f48c4cfddbdd740e"
+dependencies = [
+ "autocfg",
+ "cssparser-macros 0.3.6",
+ "dtoa-short",
+ "itoa",
+ "matches",
+ "phf 0.7.24",
+ "proc-macro2 1.0.1",
+ "procedural-masquerade",
+ "quote 1.0.2",
+ "smallvec",
+ "syn 1.0.3",
+]
+
+[[package]]
+name = "cssparser"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc63bba4f652956b1afadd4e21c52e76b7dd4f7aefb9e79db8611d0726a9d354"
dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.6.0",
"dtoa-short",
"itoa",
"matches",
- "phf",
+ "phf 0.8.0",
"proc-macro2 1.0.1",
"quote 1.0.2",
"serde",
@@ -895,6 +920,19 @@ dependencies = [
[[package]]
name = "cssparser-macros"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb1c84e87c717666564ec056105052331431803d606bd45529b28547b611eef"
+dependencies = [
+ "phf_codegen 0.7.24",
+ "proc-macro2 1.0.1",
+ "procedural-masquerade",
+ "quote 1.0.2",
+ "syn 1.0.3",
+]
+
+[[package]]
+name = "cssparser-macros"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
@@ -1400,6 +1438,12 @@ dependencies = [
]
[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
name = "fuchsia-zircon"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2038,7 +2082,7 @@ name = "hashglobe"
version = "0.1.0"
dependencies = [
"libc",
- "rand",
+ "rand 0.7.2",
]
[[package]]
@@ -2326,7 +2370,7 @@ dependencies = [
"lazy_static",
"libc",
"mio",
- "rand",
+ "rand 0.7.2",
"serde",
"tempfile",
"uuid",
@@ -2477,7 +2521,7 @@ version = "0.0.1"
dependencies = [
"app_units",
"atomic_refcell",
- "cssparser",
+ "cssparser 0.25.9",
"euclid",
"gfx",
"ipc-channel",
@@ -2846,7 +2890,7 @@ dependencies = [
"app_units",
"content-security-policy",
"crossbeam-channel",
- "cssparser",
+ "cssparser 0.27.1",
"euclid",
"hashglobe",
"hyper",
@@ -2893,8 +2937,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae38d669396ca9b707bfc3db254bc382ddb94f57cc5c235f34623a669a01dab"
dependencies = [
"log",
- "phf",
- "phf_codegen",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
"serde",
"serde_derive",
"serde_json",
@@ -3590,23 +3634,52 @@ dependencies = [
[[package]]
name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+dependencies = [
+ "phf_shared 0.7.24",
+]
+
+[[package]]
+name = "phf"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
"phf_macros",
- "phf_shared",
+ "phf_shared 0.8.0",
"proc-macro-hack",
]
[[package]]
name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+dependencies = [
+ "phf_generator 0.7.24",
+ "phf_shared 0.7.24",
+]
+
+[[package]]
+name = "phf_codegen"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+dependencies = [
+ "phf_shared 0.7.24",
+ "rand 0.6.5",
]
[[package]]
@@ -3615,8 +3688,8 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
- "phf_shared",
- "rand",
+ "phf_shared 0.8.0",
+ "rand 0.7.2",
]
[[package]]
@@ -3625,8 +3698,8 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
"proc-macro-hack",
"proc-macro2 1.0.1",
"quote 1.0.2",
@@ -3635,11 +3708,20 @@ dependencies = [
[[package]]
name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+dependencies = [
+ "siphasher 0.2.3",
+]
+
+[[package]]
+name = "phf_shared"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
dependencies = [
- "siphasher",
+ "siphasher 0.3.1",
]
[[package]]
@@ -3807,16 +3889,45 @@ dependencies = [
[[package]]
name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+dependencies = [
+ "autocfg",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac 0.1.1",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg 0.1.2",
+ "rand_xorshift",
+ "winapi",
+]
+
+[[package]]
+name = "rand"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
dependencies = [
"getrandom",
"libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
- "rand_pcg",
+ "rand_chacha 0.2.1",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg",
+ "rand_core 0.3.1",
]
[[package]]
@@ -3826,11 +3937,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
dependencies = [
"c2-chacha",
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
]
[[package]]
name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
@@ -3840,11 +3966,29 @@ dependencies = [
[[package]]
name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
]
[[package]]
@@ -3853,7 +3997,42 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76"
dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg",
+ "rand_core 0.4.2",
]
[[package]]
@@ -3862,7 +4041,16 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
]
[[package]]
@@ -3923,6 +4111,15 @@ dependencies = [
]
[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
name = "redox_syscall"
version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4108,7 +4305,7 @@ dependencies = [
"content-security-policy",
"cookie",
"crossbeam-channel",
- "cssparser",
+ "cssparser 0.27.1",
"deny_public_fields",
"devtools_traits",
"dom_struct",
@@ -4146,9 +4343,9 @@ dependencies = [
"num-traits",
"parking_lot",
"percent-encoding",
- "phf",
- "phf_codegen",
- "phf_shared",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
+ "phf_shared 0.8.0",
"pixels",
"profile_traits",
"ref_filter_map",
@@ -4279,13 +4476,13 @@ name = "selectors"
version = "0.21.0"
dependencies = [
"bitflags",
- "cssparser",
+ "cssparser 0.27.1",
"derive_more",
"fxhash",
"log",
"matches",
- "phf",
- "phf_codegen",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
"precomputed-hash",
"servo_arc",
"smallvec",
@@ -4685,9 +4882,9 @@ version = "0.0.1"
dependencies = [
"lazy_static",
"log",
- "rand",
- "rand_core",
- "rand_isaac",
+ "rand 0.7.2",
+ "rand_core 0.5.1",
+ "rand_isaac 0.2.0",
"uuid",
]
@@ -4813,6 +5010,12 @@ dependencies = [
[[package]]
name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+
+[[package]]
+name = "siphasher"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83da420ee8d1a89e640d0948c646c1c088758d3a3c538f943bfa97bdac17929d"
@@ -4919,7 +5122,7 @@ checksum = "2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
dependencies = [
"lazy_static",
"new_debug_unreachable",
- "phf_shared",
+ "phf_shared 0.8.0",
"precomputed-hash",
"serde",
]
@@ -4930,8 +5133,8 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
"proc-macro2 1.0.1",
"quote 1.0.2",
]
@@ -4953,7 +5156,7 @@ dependencies = [
"bitflags",
"byteorder",
"crossbeam-channel",
- "cssparser",
+ "cssparser 0.27.1",
"derive_more",
"encoding_rs",
"euclid",
@@ -5020,7 +5223,7 @@ name = "style_tests"
version = "0.0.1"
dependencies = [
"app_units",
- "cssparser",
+ "cssparser 0.27.1",
"euclid",
"html5ever",
"rayon",
@@ -5042,7 +5245,7 @@ version = "0.0.1"
dependencies = [
"app_units",
"bitflags",
- "cssparser",
+ "cssparser 0.27.1",
"euclid",
"lazy_static",
"malloc_size_of",
@@ -5142,7 +5345,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
"cfg-if",
"libc",
- "rand",
+ "rand 0.7.2",
"redox_syscall",
"remove_dir_all",
"winapi",
@@ -5247,7 +5450,7 @@ dependencies = [
name = "to_shmem"
version = "0.0.1"
dependencies = [
- "cssparser",
+ "cssparser 0.27.1",
"servo_arc",
"smallbitvec",
"smallvec",
@@ -5634,7 +5837,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf1d83e5fa94e6c54ee47351bc92daca1f386aa1529ffbb668d2cee5e8173013"
dependencies = [
- "rand",
+ "rand 0.7.2",
"serde",
]
@@ -6069,7 +6272,7 @@ dependencies = [
"mio",
"mio-extras",
"openssl",
- "rand",
+ "rand 0.7.2",
"sha-1",
"slab",
"url", |
```
Rect {
start_corner: Vec2 { i: 0.0 px, b: 0.0 px },
size: Vec2 { i: 1024.0 px, b: 20.0 px },
}
```
… instead of:
```
Rect {
start_corner: Vec2 {
inline: CSSPixelLength(
0.0,
),
block: CSSPixelLength(
0.0,
),
},
size: Vec2 {
inline: CSSPixelLength(
1024.0,
),
block: CSSPixelLength(
0.0,
),
},
}
```
…tylo
|
Rebased and used the bumped cssparser version: --- components/layout_2020/Cargo.toml
+++ components/layout_2020/Cargo.toml
@@ -15,7 +15,7 @@ doctest = false
[dependencies]
app_units = "0.7"
atomic_refcell = "0.1"
-cssparser = "0.25"
+cssparser = "0.27"
euclid = "0.20"
gfx = {path = "../gfx"}
ipc-channel = "0.12"@bors-servo r=nox |
|
|
bors-servo
added a commit
that referenced
this pull request
Oct 24, 2019
Layout 2020: run layout and paint background-color
|
|
|
ah, I can't edit issue title anymore but I think this is #24145
|
|
@bors-servo retry #24145 |
bors-servo
added a commit
that referenced
this pull request
Oct 24, 2019
Layout 2020: run layout and paint background-color
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
SimonSapin commentedOct 23, 2019
No description provided.