diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-09 23:00:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 23:00:51 -0500 |
commit | 2a7ef1d203b003246ddadc147251135d2b135aa6 (patch) | |
tree | cda56098085aac1f2818c131737ea379420733bd | |
parent | e029a426533235d41e062841e1e318357e63911a (diff) | |
parent | 7d1ef34698cb16ee1a7dab838066431765000154 (diff) | |
download | servo-2a7ef1d203b003246ddadc147251135d2b135aa6.tar.gz servo-2a7ef1d203b003246ddadc147251135d2b135aa6.zip |
Auto merge of #16789 - CJKu:bug-1310885-part-2, r=heycam
stylo: Export RefPtr<ImageValue> to stylo.
<!-- Please describe your changes on the following line: -->
This is the second patch in bug 1310885
"Bug 1310885 - Part 2. (stylo) Export RefPtr<ImageValue> from gecko to stylo."
Bugzilla link:
https://bugzilla.mozilla.org/show_bug.cgi?id=1310885
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/16789)
<!-- Reviewable:end -->
-rw-r--r-- | components/style/build_gecko.rs | 5 | ||||
-rw-r--r-- | components/style/gecko_bindings/sugar/refptr.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs index eacee6b3633..2db39701c5e 100644 --- a/components/style/build_gecko.rs +++ b/components/style/build_gecko.rs @@ -780,11 +780,6 @@ mod bindings { "RawGeckoServoStyleRuleList", ]; for &ty in structs_types.iter() { - // XXX cku: will be removed in Part 2. - if ty.starts_with("mozilla::css::ImageValue") { - builder = builder - .raw_line("#[allow(unused_imports)]"); - } builder = builder.hide_type(ty) .raw_line(format!("use gecko_bindings::structs::{};", ty)); // TODO this is hacky, figure out a better way to do it without diff --git a/components/style/gecko_bindings/sugar/refptr.rs b/components/style/gecko_bindings/sugar/refptr.rs index 2b3776e70fd..332fd3d857f 100644 --- a/components/style/gecko_bindings/sugar/refptr.rs +++ b/components/style/gecko_bindings/sugar/refptr.rs @@ -280,3 +280,7 @@ impl_threadsafe_refcount!(::gecko_bindings::structs::mozilla::css::URLValue, impl_threadsafe_refcount!(::gecko_bindings::structs::mozilla::css::GridTemplateAreasValue, Gecko_AddRefGridTemplateAreasValueArbitraryThread, Gecko_ReleaseGridTemplateAreasValueArbitraryThread); +impl_threadsafe_refcount!(::gecko_bindings::structs::ImageValue, + Gecko_AddRefImageValueArbitraryThread, + Gecko_ReleaseImageValueArbitraryThread); + |