Bug 1335525 - Update libgkrust to include webrender as an optional feature. r=froydnj
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 06 Feb 2017 11:42:52 -0500
changeset 479448 7fa68c2685b2d3fe239e7118a55aae852e56beed
parent 479447 bafbb19be9a460d896e0d065843e5507610b6171
child 479449 d300c689f52e788542909647d3ab05719a46bb85
push id44263
push userbmo:madeleinechercover@me.com
push dateMon, 06 Feb 2017 18:53:13 +0000
reviewersfroydnj
bugs1335525
milestone54.0a1
Bug 1335525 - Update libgkrust to include webrender as an optional feature. r=froydnj MozReview-Commit-ID: 8usfSqFWkZ0
toolkit/library/gtest/rust/Cargo.toml
toolkit/library/rust/Cargo.toml
toolkit/library/rust/shared/Cargo.toml
toolkit/library/rust/shared/lib.rs
--- a/toolkit/library/gtest/rust/Cargo.toml
+++ b/toolkit/library/gtest/rust/Cargo.toml
@@ -3,16 +3,17 @@ name = "gkrust-gtest"
 version = "0.1.0"
 authors = ["nobody@mozilla.org"]
 license = "MPL-2.0"
 description = "Testing code for libgkrust"
 
 [features]
 bindgen = ["gkrust-shared/bindgen"]
 servo = ["gkrust-shared/servo"]
+quantum_render = ["gkrust-shared/quantum_render"]
 
 [dependencies]
 mp4parse-gtest = { path = "../../../../dom/media/gtest" }
 nsstring-gtest = { path = "../../../../xpcom/rust/nsstring/gtest" }
 gkrust-shared = { path = "../../rust/shared" }
 
 [lib]
 path = "lib.rs"
--- a/toolkit/library/rust/Cargo.toml
+++ b/toolkit/library/rust/Cargo.toml
@@ -3,16 +3,17 @@ name = "gkrust"
 version = "0.1.0"
 authors = ["nobody@mozilla.org"]
 license = "MPL-2.0"
 description = "Rust code for libxul"
 
 [features]
 bindgen = ["gkrust-shared/bindgen"]
 servo = ["gkrust-shared/servo"]
+quantum_render = ["gkrust-shared/quantum_render"]
 
 [dependencies]
 gkrust-shared = { path = "shared" }
 
 [lib]
 path = "lib.rs"
 crate-type = ["staticlib"]
 test = false
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -5,21 +5,23 @@ authors = ["nobody@mozilla.org"]
 license = "MPL-2.0"
 description = "Shared Rust code for libxul"
 
 [dependencies]
 geckoservo = { path = "../../geckolib", optional = true }
 mp4parse_capi = { path = "../../../../media/libstagefright/binding/mp4parse_capi" }
 nsstring = { path = "../../../../xpcom/rust/nsstring" }
 rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" }
+webrender_bindings = { path = "../../../../gfx/webrender_bindings", optional = true }
 
 [features]
 default = []
 bindgen = ["geckoservo/bindgen"]
 servo = ["geckoservo"]
+quantum_render = ["webrender_bindings"]
 
 [lib]
 path = "lib.rs"
 test = false
 doctest = false
 bench = false
 doc = false
 plugin = false
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -3,8 +3,10 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #[cfg(feature="servo")]
 extern crate geckoservo;
 
 extern crate mp4parse_capi;
 extern crate nsstring;
 extern crate rust_url_capi;
+#[cfg(feature = "quantum_render")]
+extern crate webrender_bindings;