Bug 1409736 - Update Cargo lockfiles and re-generate FFI header. r=jrmuizel

MozReview-Commit-ID: Ad50zkjSkcE

--HG--
extra : rebase_source : a13a33032b8fc30955183f69b06b1585524c1cb4
This commit is contained in:
Kartikaya Gupta 2017-10-23 09:48:21 -04:00
Родитель 5e25afb9c5
Коммит f716b008d0
3 изменённых файлов: 22 добавлений и 13 удалений

Просмотреть файл

@ -41,6 +41,13 @@ enum class BoxShadowClipMode : uint32_t {
Sentinel /* this must be last for serialization purposes. */ Sentinel /* this must be last for serialization purposes. */
}; };
enum class ClipMode {
Clip = 0,
ClipOut = 1,
Sentinel /* this must be last for serialization purposes. */
};
enum class ExtendMode : uint32_t { enum class ExtendMode : uint32_t {
Clamp = 0, Clamp = 0,
Repeat = 1, Repeat = 1,
@ -450,10 +457,14 @@ struct ComplexClipRegion {
LayoutRect rect; LayoutRect rect;
// Border radii of this rectangle. // Border radii of this rectangle.
BorderRadius radii; BorderRadius radii;
// Whether we are clipping inside or outside
// the region.
ClipMode mode;
bool operator==(const ComplexClipRegion& aOther) const { bool operator==(const ComplexClipRegion& aOther) const {
return rect == aOther.rect && return rect == aOther.rect &&
radii == aOther.radii; radii == aOther.radii &&
mode == aOther.mode;
} }
}; };

11
toolkit/library/gtest/rust/Cargo.lock сгенерированный
Просмотреть файл

@ -1564,7 +1564,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.52.1" version = "0.53.0"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1586,12 +1586,12 @@ dependencies = [
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1", "webrender_api 0.53.0",
] ]
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.52.1" version = "0.53.0"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1601,7 +1601,6 @@ dependencies = [
"core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1616,8 +1615,8 @@ dependencies = [
"gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.52.1", "webrender 0.53.0",
"webrender_api 0.52.1", "webrender_api 0.53.0",
] ]
[[package]] [[package]]

11
toolkit/library/rust/Cargo.lock сгенерированный
Просмотреть файл

@ -1576,7 +1576,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.52.1" version = "0.53.0"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1598,12 +1598,12 @@ dependencies = [
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.1", "webrender_api 0.53.0",
] ]
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.52.1" version = "0.53.0"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1613,7 +1613,6 @@ dependencies = [
"core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1628,8 +1627,8 @@ dependencies = [
"gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.52.1", "webrender 0.53.0",
"webrender_api 0.52.1", "webrender_api 0.53.0",
] ]
[[package]] [[package]]