From f716b008d0b08e74caf1aa3dec2be1d6900b2357 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Mon, 23 Oct 2017 09:48:21 -0400 Subject: [PATCH] Bug 1409736 - Update Cargo lockfiles and re-generate FFI header. r=jrmuizel MozReview-Commit-ID: Ad50zkjSkcE --HG-- extra : rebase_source : a13a33032b8fc30955183f69b06b1585524c1cb4 --- gfx/webrender_bindings/webrender_ffi_generated.h | 13 ++++++++++++- toolkit/library/gtest/rust/Cargo.lock | 11 +++++------ toolkit/library/rust/Cargo.lock | 11 +++++------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h index 1768f4482a05..fdecd9adb541 100644 --- a/gfx/webrender_bindings/webrender_ffi_generated.h +++ b/gfx/webrender_bindings/webrender_ffi_generated.h @@ -41,6 +41,13 @@ enum class BoxShadowClipMode : uint32_t { 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 { Clamp = 0, Repeat = 1, @@ -450,10 +457,14 @@ struct ComplexClipRegion { LayoutRect rect; // Border radii of this rectangle. BorderRadius radii; + // Whether we are clipping inside or outside + // the region. + ClipMode mode; bool operator==(const ComplexClipRegion& aOther) const { return rect == aOther.rect && - radii == aOther.radii; + radii == aOther.radii && + mode == aOther.mode; } }; diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock index 3e60a0fbdd31..cd3ce0b6f4af 100644 --- a/toolkit/library/gtest/rust/Cargo.lock +++ b/toolkit/library/gtest/rust/Cargo.lock @@ -1564,7 +1564,7 @@ dependencies = [ [[package]] name = "webrender" -version = "0.52.1" +version = "0.53.0" dependencies = [ "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)", @@ -1586,12 +1586,12 @@ dependencies = [ "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)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.52.1", + "webrender_api 0.53.0", ] [[package]] name = "webrender_api" -version = "0.52.1" +version = "0.53.0" dependencies = [ "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)", @@ -1601,7 +1601,6 @@ dependencies = [ "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)", "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)", "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)", "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)", - "webrender 0.52.1", - "webrender_api 0.52.1", + "webrender 0.53.0", + "webrender_api 0.53.0", ] [[package]] diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock index 3c3242e769d6..48ba7969b018 100644 --- a/toolkit/library/rust/Cargo.lock +++ b/toolkit/library/rust/Cargo.lock @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "webrender" -version = "0.52.1" +version = "0.53.0" dependencies = [ "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)", @@ -1598,12 +1598,12 @@ dependencies = [ "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)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_api 0.52.1", + "webrender_api 0.53.0", ] [[package]] name = "webrender_api" -version = "0.52.1" +version = "0.53.0" dependencies = [ "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)", @@ -1613,7 +1613,6 @@ dependencies = [ "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)", "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)", "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)", "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)", - "webrender 0.52.1", - "webrender_api 0.52.1", + "webrender 0.53.0", + "webrender_api 0.53.0", ] [[package]]