Skip to content

Commit

Permalink
Auto merge of #13701 - Manishearth:nsstring, r=emilio,mystor
Browse files Browse the repository at this point in the history
Vendor nsstring bindings, use for text-overflow

From [bug 1309165](https://bugzilla.mozilla.org/show_bug.cgi?id=1309165)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13701)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 12, 2016
2 parents a466f43 + 0c793d7 commit f584003
Show file tree
Hide file tree
Showing 11 changed files with 1,012 additions and 54 deletions.
3 changes: 2 additions & 1 deletion components/style/Cargo.toml
Expand Up @@ -13,7 +13,7 @@ path = "lib.rs"
doctest = false

[features]
gecko = []
gecko = ["nsstring_vendor"]
servo = ["serde/unstable", "serde", "serde_derive", "heapsize_plugin",
"style_traits/servo", "app_units/plugins",
"cssparser/heap_size", "cssparser/serde-serialization",
Expand All @@ -36,6 +36,7 @@ lazy_static = "0.2"
log = "0.3.5"
libc = "0.2"
matches = "0.1"
nsstring_vendor = {path = "gecko_bindings/nsstring_vendor", optional = true}
num-integer = "0.1.32"
num-traits = "0.1.32"
num_cpus = "0.2.2"
Expand Down
7 changes: 7 additions & 0 deletions components/style/binding_tools/regen.py
Expand Up @@ -68,7 +68,9 @@
"raw_lines": [
# We can get rid of this when the bindings move into the style crate.
"pub enum OpaqueStyleData {}",
"pub use nsstring::nsStringRepr as nsString;"
],
"blacklist_types": ["nsString"],
"whitelist_vars": [
"NS_THEME_.*",
"NODE_.*",
Expand Down Expand Up @@ -426,6 +428,11 @@ def zero_size_type(ty, flags):
flags.append("--opaque-type")
flags.append(ty)

if "blacklist_types" in current_target:
for ty in current_target["blacklist_types"]:
flags.append("--blacklist-type")
flags.append(ty)

if "servo_nullable_arc_types" in current_target:
for ty in current_target["servo_nullable_arc_types"]:
flags.append("--blacklist-type")
Expand Down
12 changes: 12 additions & 0 deletions components/style/gecko_bindings/nsstring_vendor/Cargo.toml
@@ -0,0 +1,12 @@
[package]
name = "nsstring_vendor"
version = "0.1.0"
authors = ["nobody@mozilla.com"]
license = "MPL-2.0"
description = "Rust bindings to xpcom string types"


# Revendoring nsstring from m-c into Servo

[dependencies]

0 comments on commit f584003

Please sign in to comment.